leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[ALSA] sb16 - Fix duplicated PnP entry

Browse Source 
Modules: SB16/AWE driver

Fix the duplicated PnP entry between sb16 and sbawe drivers.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2006-01-20 14:03:39 +01:00 committed by Jaroslav Kysela
parent 62af9905a1
commit 80faf041cd
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sound/isa/sb/sb16.c
View File

@ -179,6 +179,8 @@ static struct pnp_card_device_id snd_sb16_pnpids[] = {
{ .id = "CTL0086", .devs = { { "CTL0041" } } }, { .id = "CTL0086", .devs = { { "CTL0041" } } },
/* Sound Blaster Vibra16X */ /* Sound Blaster Vibra16X */
{ .id = "CTL00f0", .devs = { { "CTL0043" } } }, { .id = "CTL00f0", .devs = { { "CTL0043" } } },
/* Sound Blaster 16 (Virtual PC 2004) */
{ .id = "tBA03b0", .devs = { {.id="PNPb003" } } },
#else /* SNDRV_SBAWE defined */ #else /* SNDRV_SBAWE defined */
/* Sound Blaster AWE 32 PnP */ /* Sound Blaster AWE 32 PnP */
{ .id = "CTL0035", .devs = { { "CTL0031" }, { "CTL0021" } } }, { .id = "CTL0035", .devs = { { "CTL0031" }, { "CTL0021" } } },
@ -235,8 +237,6 @@ static struct pnp_card_device_id snd_sb16_pnpids[] = {
{ .id = "CTLXXXX" , .devs = { { "CTL0044" }, { "CTL0023" } } }, { .id = "CTLXXXX" , .devs = { { "CTL0044" }, { "CTL0023" } } },
{ .id = "CTLXXXX" , .devs = { { "CTL0045" }, { "CTL0022" } } }, { .id = "CTLXXXX" , .devs = { { "CTL0045" }, { "CTL0022" } } },
#endif /* SNDRV_SBAWE */ #endif /* SNDRV_SBAWE */
/* Sound Blaster 16 PnP (Virtual PC 2004)*/
{ .id = "tBA03b0", .devs = { { "PNPb003" } } },
{ .id = "", } { .id = "", }
}; };