diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-12 13:03:35 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-12 13:03:35 -0700 |
| commit | 155dbfd8846bf165bb036c4492ad121c8b059f1d (patch) | |
| tree | 93c1140ecece7daac04da8a980d7b1d1e0c36bb0 /sound/pci/intel8x0.c | |
| parent | 15e0c694367332d7e7114c7c73044bc5fed9ee48 (diff) | |
| parent | d2a5b9d45f31bf5e5a1b89a87421e218ebe1a6ba (diff) | |
Merge commit master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa of HEAD
* HEAD:
[ALSA] Fix undefined (missing) references in ISA MIRO sound driver
[ALSA] make sound/isa/gus/gusextreme.c:devices static
[ALSA] hda-codec - Fix missing array terminators in AD1988 codec support
[ALSA] Fix a deadlock in snd-rtctimer
[ALSA] Fix section mismatch errors in ALSA PCI drivers
[ALSA] remove unused snd_minor.name field
[ALSA] Fix no mpu401 interface can cause hard freeze
[ALSA] wavefront: fix __init/__devinit confusion
[ALSA] Fix workaround for AD1988A rev2 codec
[ALSA] trivial: Code clean up of i2c/cs8427.c
[ALSA] sound/i2c/cs8427.c: don't export a static function
[ALSA] intel8x0 - Add ac97 quirk for Tyan Thunder K8WE board
[ALSA] Reduce the string length of Terratec Aureon 7.1 Universe
[ALSA] sound/pci/Kconfig - fix broken indenting for SND_FM801_TEA575X
[ALSA] fix the SND_FM801_TEA575X dependencies
[ALSA] Memory leak in sound/pcmcia/pdaudiocf/pdaudiocf.c
Diffstat (limited to 'sound/pci/intel8x0.c')
| -rw-r--r-- | sound/pci/intel8x0.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sound/pci/intel8x0.c b/sound/pci/intel8x0.c index 5634bc34925..6874263f168 100644 --- a/sound/pci/intel8x0.c +++ b/sound/pci/intel8x0.c @@ -413,7 +413,7 @@ struct intel8x0 { u32 int_sta_mask; /* interrupt status mask */ }; -static struct pci_device_id snd_intel8x0_ids[] __devinitdata = { +static struct pci_device_id snd_intel8x0_ids[] = { { 0x8086, 0x2415, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_INTEL }, /* 82801AA */ { 0x8086, 0x2425, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_INTEL }, /* 82901AB */ { 0x8086, 0x2445, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_INTEL }, /* 82801BA */ @@ -1956,6 +1956,12 @@ static struct ac97_quirk ac97_quirks[] __devinitdata = { .type = AC97_TUNE_HP_ONLY }, { + .subvendor = 0x10f1, + .subdevice = 0x2895, + .name = "Tyan Thunder K8WE", + .type = AC97_TUNE_HP_ONLY + }, + { .subvendor = 0x110a, .subdevice = 0x0056, .name = "Fujitsu-Siemens Scenic", /* AD1981? */ |