aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2006-01-20 08:03:39 -0500
committerJaroslav Kysela <perex@suse.cz>2006-01-22 10:25:00 -0500
commit80faf041cd731bde220523166f016377e1765acd (patch)
treeb261e1ce0bf2bef48da4a7448346ba08dce44107 /sound
parent62af9905a1f809094f5209ae15d2ce69599a8123 (diff)
[ALSA] sb16 - Fix duplicated PnP entry
Modules: SB16/AWE driver Fix the duplicated PnP entry between sb16 and sbawe drivers. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r--sound/isa/sb/sb16.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/isa/sb/sb16.c b/sound/isa/sb/sb16.c
index c0be7a5a3425..0667bd14ad60 100644
--- a/sound/isa/sb/sb16.c
+++ b/sound/isa/sb/sb16.c
@@ -179,6 +179,8 @@ static struct pnp_card_device_id snd_sb16_pnpids[] = {
179 { .id = "CTL0086", .devs = { { "CTL0041" } } }, 179 { .id = "CTL0086", .devs = { { "CTL0041" } } },
180 /* Sound Blaster Vibra16X */ 180 /* Sound Blaster Vibra16X */
181 { .id = "CTL00f0", .devs = { { "CTL0043" } } }, 181 { .id = "CTL00f0", .devs = { { "CTL0043" } } },
182 /* Sound Blaster 16 (Virtual PC 2004) */
183 { .id = "tBA03b0", .devs = { {.id="PNPb003" } } },
182#else /* SNDRV_SBAWE defined */ 184#else /* SNDRV_SBAWE defined */
183 /* Sound Blaster AWE 32 PnP */ 185 /* Sound Blaster AWE 32 PnP */
184 { .id = "CTL0035", .devs = { { "CTL0031" }, { "CTL0021" } } }, 186 { .id = "CTL0035", .devs = { { "CTL0031" }, { "CTL0021" } } },
@@ -235,8 +237,6 @@ static struct pnp_card_device_id snd_sb16_pnpids[] = {
235 { .id = "CTLXXXX" , .devs = { { "CTL0044" }, { "CTL0023" } } }, 237 { .id = "CTLXXXX" , .devs = { { "CTL0044" }, { "CTL0023" } } },
236 { .id = "CTLXXXX" , .devs = { { "CTL0045" }, { "CTL0022" } } }, 238 { .id = "CTLXXXX" , .devs = { { "CTL0045" }, { "CTL0022" } } },
237#endif /* SNDRV_SBAWE */ 239#endif /* SNDRV_SBAWE */
238 /* Sound Blaster 16 PnP (Virtual PC 2004)*/
239 { .id = "tBA03b0", .devs = { { "PNPb003" } } },
240 { .id = "", } 240 { .id = "", }
241}; 241};
242 242