aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/emu10k1
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2008-11-07 03:06:05 -0500
committerTakashi Iwai <tiwai@suse.de>2008-11-07 03:06:05 -0500
commit63cf123bf5d538a066e4a899390c9ce56ab6df9f (patch)
tree00a5e6eabcfdd310247018188f8ebe35b8b6f1ba /sound/pci/emu10k1
parent6834d7ce224a6f6a1dd05da3a867730c40943154 (diff)
parentfcef7836a31c6432b41a38867d413ed3d6aa8261 (diff)
Merge branch 'topic/fix/misc' into topic/misc
Diffstat (limited to 'sound/pci/emu10k1')
-rw-r--r--sound/pci/emu10k1/emu10k1_main.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/sound/pci/emu10k1/emu10k1_main.c b/sound/pci/emu10k1/emu10k1_main.c
index dee7ebabccee..7958006a1d66 100644
--- a/sound/pci/emu10k1/emu10k1_main.c
+++ b/sound/pci/emu10k1/emu10k1_main.c
@@ -1470,6 +1470,7 @@ static struct snd_emu_chip_details emu_chip_details[] = {
1470 .ca0151_chip = 1, 1470 .ca0151_chip = 1,
1471 .spk71 = 1, 1471 .spk71 = 1,
1472 .spdif_bug = 1, 1472 .spdif_bug = 1,
1473 .invert_shared_spdif = 1, /* digital/analog switch swapped */
1473 .ac97_chip = 1} , 1474 .ac97_chip = 1} ,
1474 {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x20021102, 1475 {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x20021102,
1475 .driver = "Audigy2", .name = "SB Audigy 2 ZS [SB0350]", 1476 .driver = "Audigy2", .name = "SB Audigy 2 ZS [SB0350]",
@@ -1479,6 +1480,7 @@ static struct snd_emu_chip_details emu_chip_details[] = {
1479 .ca0151_chip = 1, 1480 .ca0151_chip = 1,
1480 .spk71 = 1, 1481 .spk71 = 1,
1481 .spdif_bug = 1, 1482 .spdif_bug = 1,
1483 .invert_shared_spdif = 1, /* digital/analog switch swapped */
1482 .ac97_chip = 1} , 1484 .ac97_chip = 1} ,
1483 {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x20011102, 1485 {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x20011102,
1484 .driver = "Audigy2", .name = "SB Audigy 2 ZS [SB0360]", 1486 .driver = "Audigy2", .name = "SB Audigy 2 ZS [SB0360]",
@@ -1488,6 +1490,7 @@ static struct snd_emu_chip_details emu_chip_details[] = {
1488 .ca0151_chip = 1, 1490 .ca0151_chip = 1,
1489 .spk71 = 1, 1491 .spk71 = 1,
1490 .spdif_bug = 1, 1492 .spdif_bug = 1,
1493 .invert_shared_spdif = 1, /* digital/analog switch swapped */
1491 .ac97_chip = 1} , 1494 .ac97_chip = 1} ,
1492 /* Audigy 2 */ 1495 /* Audigy 2 */
1493 /* Tested by James@superbug.co.uk 3rd July 2005 */ 1496 /* Tested by James@superbug.co.uk 3rd July 2005 */