summaryrefslogtreecommitdiff
path: root/sound/pci
diff options
context:
space:
mode:
authorJames Courtier-Dutton <James@superbug.co.uk>2005-07-10 11:50:36 +0200
committerJaroslav Kysela <perex@suse.cz>2005-07-28 12:22:25 +0200
commit7c1d549aa9b22365fe5405c372f840cdbc6315f5 (patch)
tree8b3b877d0399479bea0de99476b9ee21d05f543a /sound/pci
parentb27c187f95cd6c9f13f26a5088bea384ac557b45 (diff)
downloadlinux-3.10-7c1d549aa9b22365fe5405c372f840cdbc6315f5.tar.gz
linux-3.10-7c1d549aa9b22365fe5405c372f840cdbc6315f5.tar.bz2
linux-3.10-7c1d549aa9b22365fe5405c372f840cdbc6315f5.zip
[ALSA] emu10k1: Add EMU 1212m card entry and document it as not supported yet.
EMU10K1/EMU10K2 driver Signed-off-by: James Courtier-Dutton <James@superbug.co.uk>
Diffstat (limited to 'sound/pci')
-rw-r--r--sound/pci/emu10k1/emu10k1_main.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/sound/pci/emu10k1/emu10k1_main.c b/sound/pci/emu10k1/emu10k1_main.c
index 7c31d9b3024..746b51ef396 100644
--- a/sound/pci/emu10k1/emu10k1_main.c
+++ b/sound/pci/emu10k1/emu10k1_main.c
@@ -630,6 +630,13 @@ static emu_chip_details_t emu_chip_details[] = {
.emu10k2_chip = 1,
.ca0108_chip = 1,
.ac97_chip = 1} ,
+ /* Tested by James@superbug.co.uk 8th July 2005. No sound available yet. */
+ {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x40011102,
+ .driver = "Audigy2", .name = "E-mu 1212m [4001]",
+ .id = "EMU1212m",
+ .emu10k2_chip = 1,
+ .ca0102_chip = 1,
+ .ecard = 1} ,
/* Tested by James@superbug.co.uk 3rd July 2005 */
{.vendor = 0x1102, .device = 0x0004, .subsystem = 0x20071102,
.driver = "Audigy2", .name = "Audigy 4 PRO [SB0380]",