From: Jaroslav Kysela <perex@suse.cz>
Date: Sun, 22 Jan 2006 08:28:15 +0000 (+0100)
Subject: [ALSA] cs4232/cs4236 - moved CS423X_DRIVER define outside CONFIG_PNP
X-Git-Tag: v2.6.16-rc2~1^2~7^2~19
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=ec80859ed292a55334df68fc2492f1303cf3a0ac;p=linux-2.6-omap-h63xx.git

[ALSA] cs4232/cs4236 - moved CS423X_DRIVER define outside CONFIG_PNP

Modules: CS4236+ driver

Signed-off-by: Jaroslav Kysela <perex@suse.cz>
---

diff --git a/sound/isa/cs423x/cs4236.c b/sound/isa/cs423x/cs4236.c
index 2bfa68b01fe..edf9279bf9d 100644
--- a/sound/isa/cs423x/cs4236.c
+++ b/sound/isa/cs423x/cs4236.c
@@ -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 */