summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorJames Courtier-Dutton <James@superbug.co.uk>2007-04-19 11:14:41 +0100
committerMercurial server <hg@alsa0.alsa-project.org>2007-05-11 16:56:13 +0200
commit82c8c74107c31673478031e90e24a2b74ca680f2 (patch)
tree343512d9860963c2c46c2d66cf9ce074b1065748 /sound
parent86f55319011499662ec7f78db1640b1d158fcba0 (diff)
downloadlinux-3.10-82c8c74107c31673478031e90e24a2b74ca680f2.tar.gz
linux-3.10-82c8c74107c31673478031e90e24a2b74ca680f2.tar.bz2
linux-3.10-82c8c74107c31673478031e90e24a2b74ca680f2.zip
[ALSA] snd-emu10k1: Prevent E-Mu 1010 Notebook card from hanging PC.
E-Mu 1010 is not currently supported yet. Needs development work. Signed-off-by: James Courtier-Dutton <James@superbug.co.uk> Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/emu10k1/emu10k1_main.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/sound/pci/emu10k1/emu10k1_main.c b/sound/pci/emu10k1/emu10k1_main.c
index 80aa585eade..a130472314c 100644
--- a/sound/pci/emu10k1/emu10k1_main.c
+++ b/sound/pci/emu10k1/emu10k1_main.c
@@ -1216,6 +1216,15 @@ static struct snd_emu_chip_details emu_chip_details[] = {
.spi_dac = 1,
.i2c_adc = 1,
.spk71 = 1} ,
+ {.vendor = 0x1102, .device = 0x0008, .subsystem = 0x42011102,
+ .driver = "Audigy2", .name = "E-mu 1010 Notebook [MAEM8950]",
+ .id = "EMU1010",
+ .emu10k2_chip = 1,
+ .ca0108_chip = 1,
+ .ca_cardbus_chip = 1,
+ .spi_dac = 1,
+ .i2c_adc = 1,
+ .spk71 = 1} ,
{.vendor = 0x1102, .device = 0x0008,
.driver = "Audigy2", .name = "Audigy 2 Value [Unknown]",
.id = "Audigy2",