From b342e809497a73b79aafc2a2be69d767f918ad73 Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <perex@suse.cz>
Date: Sun, 22 Jan 2006 09:28:15 +0100
Subject: [PATCH] --- yaml --- r: 19567 b: refs/heads/master c:
 ec80859ed292a55334df68fc2492f1303cf3a0ac h: refs/heads/master i:   19565:
 a6e55f5c755c60f24a06bdb069860bf881b2f2b2   19563:
 bd7bc2a3fe9b4267933b8301419e38b7b2ba4db4   19559:
 7c3d9b4a06980ccf247c252349abce32beabbc3f   19551:
 29ac0a2868a2348193540a65aa2b5c73f14d1b06 v: v3

---
 [refs]                          | 2 +-
 trunk/sound/isa/cs423x/cs4236.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index d13152e459d0..e210e752e06d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 168a95f170070ddda1ba7505c2ce9ae8b50f21f6
+refs/heads/master: ec80859ed292a55334df68fc2492f1303cf3a0ac
diff --git a/trunk/sound/isa/cs423x/cs4236.c b/trunk/sound/isa/cs423x/cs4236.c
index 2bfa68b01fe4..edf9279bf9d9 100644
--- a/trunk/sound/isa/cs423x/cs4236.c
+++ b/trunk/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 */