diff options
author | Jaroslav Kysela <perex@suse.cz> | 2006-01-22 03:28:15 -0500 |
---|---|---|
committer | Jaroslav Kysela <perex@suse.cz> | 2006-01-22 11:10:43 -0500 |
commit | ec80859ed292a55334df68fc2492f1303cf3a0ac (patch) | |
tree | 6ecbffbcb4bd16c002d5fdceb110f7a1c1b6eeb2 | |
parent | 168a95f170070ddda1ba7505c2ce9ae8b50f21f6 (diff) |
[ALSA] cs4232/cs4236 - moved CS423X_DRIVER define outside CONFIG_PNP
Modules: CS4236+ driver
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
-rw-r--r-- | sound/isa/cs423x/cs4236.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/isa/cs423x/cs4236.c b/sound/isa/cs423x/cs4236.c index 2bfa68b01fe4..edf9279bf9d9 100644 --- a/sound/isa/cs423x/cs4236.c +++ b/sound/isa/cs423x/cs4236.c | |||
@@ -75,8 +75,10 @@ MODULE_SUPPORTED_DEVICE("{{Crystal Semiconductors,CS4235}," | |||
75 | 75 | ||
76 | #ifdef CS4232 | 76 | #ifdef CS4232 |
77 | #define IDENT "CS4232" | 77 | #define IDENT "CS4232" |
78 | #define CS423X_DRIVER "snd_cs4232" | ||
78 | #else | 79 | #else |
79 | #define IDENT "CS4236+" | 80 | #define IDENT "CS4236+" |
81 | #define CS423X_DRIVER "snd_cs4236" | ||
80 | #endif | 82 | #endif |
81 | 83 | ||
82 | static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; /* Index 0-MAX */ | 84 | static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; /* Index 0-MAX */ |
@@ -160,7 +162,6 @@ MODULE_DEVICE_TABLE(pnp, snd_cs4232_pnpbiosids); | |||
160 | #endif /* CS4232 */ | 162 | #endif /* CS4232 */ |
161 | 163 | ||
162 | #ifdef CS4232 | 164 | #ifdef CS4232 |
163 | #define CS423X_DRIVER "snd_cs4232" | ||
164 | #define CS423X_ISAPNP_DRIVER "cs4232_isapnp" | 165 | #define CS423X_ISAPNP_DRIVER "cs4232_isapnp" |
165 | static struct pnp_card_device_id snd_cs423x_pnpids[] = { | 166 | static struct pnp_card_device_id snd_cs423x_pnpids[] = { |
166 | /* Philips PCA70PS */ | 167 | /* Philips PCA70PS */ |
@@ -181,7 +182,6 @@ static struct pnp_card_device_id snd_cs423x_pnpids[] = { | |||
181 | { .id = "" } /* end */ | 182 | { .id = "" } /* end */ |
182 | }; | 183 | }; |
183 | #else /* CS4236 */ | 184 | #else /* CS4236 */ |
184 | #define CS423X_DRIVER "snd_cs4236" | ||
185 | #define CS423X_ISAPNP_DRIVER "cs4236_isapnp" | 185 | #define CS423X_ISAPNP_DRIVER "cs4236_isapnp" |
186 | static struct pnp_card_device_id snd_cs423x_pnpids[] = { | 186 | static struct pnp_card_device_id snd_cs423x_pnpids[] = { |
187 | /* Intel Marlin Spike Motherboard - CS4235 */ | 187 | /* Intel Marlin Spike Motherboard - CS4235 */ |