From 3d8a44772a094a5cb9db2499391fe1630113a23e Mon Sep 17 00:00:00 2001 From: Veli-Matti Valtonen Date: Mon, 7 Jan 2008 12:36:56 +0100 Subject: [PATCH] --- yaml --- r: 81743 b: refs/heads/master c: 493b4acb9ed3193b19d45d62e0e5740d20f47adc h: refs/heads/master i: 81741: ebad09f4e900ca20ac01c2c157dbbba317173042 81739: 893fb3111e5d484617ee7e931ee14f29e94d3797 81735: f97da344ccc239b3098dc54bc6828be3ee24ee3c 81727: 9ceac4d2de5c6207505e0cc8a49235ac33984812 v: v3 --- [refs] | 2 +- trunk/sound/pci/emu10k1/emu10k1_main.c | 26 +++++++++++++++++--------- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index eaa13a29831f..961f9e60b221 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bd3d1c2096ff99311b8524273ba0f53502365136 +refs/heads/master: 493b4acb9ed3193b19d45d62e0e5740d20f47adc diff --git a/trunk/sound/pci/emu10k1/emu10k1_main.c b/trunk/sound/pci/emu10k1/emu10k1_main.c index 560bc50e6729..9a9b977d3cf1 100644 --- a/trunk/sound/pci/emu10k1/emu10k1_main.c +++ b/trunk/sound/pci/emu10k1/emu10k1_main.c @@ -1393,14 +1393,6 @@ static struct snd_emu_chip_details emu_chip_details[] = { .spi_dac = 1, .i2c_adc = 1, .spk71 = 1} , - /* Tested by James@superbug.co.uk 20-3-2007. */ - {.vendor = 0x1102, .device = 0x0008, .subsystem = 0x40021102, - .driver = "Audigy2", .name = "E-mu 0404 [4002]", - .id = "EMU0404", - .emu10k2_chip = 1, - .ca0102_chip = 1, - .spk71 = 1, - .emu_model = EMU_MODEL_EMU0404} , /* EMU 0404 */ /* Tested by James@superbug.co.uk 4th Nov 2007. */ {.vendor = 0x1102, .device = 0x0008, .subsystem = 0x42011102, .driver = "Audigy2", .name = "E-mu 1010 Notebook [MAEM8950]", @@ -1425,7 +1417,23 @@ static struct snd_emu_chip_details emu_chip_details[] = { .emu10k2_chip = 1, .ca0102_chip = 1, .spk71 = 1, - .emu_model = EMU_MODEL_EMU1010} , /* Emu 1010 */ + .emu_model = EMU_MODEL_EMU1010}, /* Emu 1010 */ + /* EMU0404b */ + {.vendor = 0x1102, .device = 0x0008, .subsystem = 0x40021102, + .driver = "Audigy2", .name = "E-mu 0404b [4002]", + .id = "EMU0404", + .emu10k2_chip = 1, + .ca0108_chip = 1, + .spk71 = 1, + .emu_model = EMU_MODEL_EMU0404}, /* EMU 0404 */ + /* Tested by James@superbug.co.uk 20-3-2007. */ + {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x40021102, + .driver = "Audigy2", .name = "E-mu 0404 [4002]", + .id = "EMU0404", + .emu10k2_chip = 1, + .ca0102_chip = 1, + .spk71 = 1, + .emu_model = EMU_MODEL_EMU0404}, /* EMU 0404 */ /* Audigy4 (Not PRO) SB0610 */ {.vendor = 0x1102, .device = 0x0008, .driver = "Audigy2", .name = "Audigy 2 Value [Unknown]",