]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
[ALSA] cs4232/cs4236 - moved CS423X_DRIVER define outside CONFIG_PNP
authorJaroslav Kysela <perex@suse.cz>
Sun, 22 Jan 2006 08:28:15 +0000 (09:28 +0100)
committerJaroslav Kysela <perex@suse.cz>
Sun, 22 Jan 2006 16:10:43 +0000 (17:10 +0100)
Modules: CS4236+ driver

Signed-off-by: Jaroslav Kysela <perex@suse.cz>
sound/isa/cs423x/cs4236.c

index 2bfa68b01fe4866a7952e993a878ba75c27f1582..edf9279bf9d95e2d9e6c4a794fcad3594ca9d254 100644 (file)
@@ -75,8 +75,10 @@ MODULE_SUPPORTED_DEVICE("{{Crystal Semiconductors,CS4235},"
 
 #ifdef CS4232
 #define IDENT "CS4232"
+#define CS423X_DRIVER "snd_cs4232"
 #else
 #define IDENT "CS4236+"
+#define CS423X_DRIVER "snd_cs4236"
 #endif
 
 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;     /* Index 0-MAX */
@@ -160,7 +162,6 @@ MODULE_DEVICE_TABLE(pnp, snd_cs4232_pnpbiosids);
 #endif /* CS4232 */
 
 #ifdef CS4232
-#define CS423X_DRIVER          "snd_cs4232"
 #define CS423X_ISAPNP_DRIVER   "cs4232_isapnp"
 static struct pnp_card_device_id snd_cs423x_pnpids[] = {
        /* Philips PCA70PS */
@@ -181,7 +182,6 @@ static struct pnp_card_device_id snd_cs423x_pnpids[] = {
        { .id = "" }    /* end */
 };
 #else /* CS4236 */
-#define CS423X_DRIVER          "snd_cs4236"
 #define CS423X_ISAPNP_DRIVER   "cs4236_isapnp"
 static struct pnp_card_device_id snd_cs423x_pnpids[] = {
        /* Intel Marlin Spike Motherboard - CS4235 */