summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-04-19 11:39:57 +0200
committerTakashi Iwai <tiwai@suse.de>2009-04-19 11:39:57 +0200
commit81584a079fc7a18b53fc7db4232419a8faadd414 (patch)
tree6b3c8160d4744e46eb2cc9378bf53d5c42227d27 /sound
parent7c4112a285b00e137db04844b8b9b478e5d4363e (diff)
parentc82834251ceb81b7575927c767500bd8c4a7f928 (diff)
downloadlinux-81584a079fc7a18b53fc7db4232419a8faadd414.tar.bz2
Merge branch 'fix/intel8x0' into for-linus
* fix/intel8x0: ALSA: Intel8x0: Add hp_only quirk for SSID 0x1028016a (Dell Inspiron 8600) ALSA: Intel8x0: Remove conflicting quirk for SSID 0x103c0934
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/intel8x0.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/sound/pci/intel8x0.c b/sound/pci/intel8x0.c
index 5dced5b79387..8042d5398892 100644
--- a/sound/pci/intel8x0.c
+++ b/sound/pci/intel8x0.c
@@ -1854,6 +1854,12 @@ static struct ac97_quirk ac97_quirks[] __devinitdata = {
},
{
.subvendor = 0x1028,
+ .subdevice = 0x016a,
+ .name = "Dell Inspiron 8600", /* STAC9750/51 */
+ .type = AC97_TUNE_HP_ONLY
+ },
+ {
+ .subvendor = 0x1028,
.subdevice = 0x0186,
.name = "Dell Latitude D810", /* cf. Malone #41015 */
.type = AC97_TUNE_HP_MUTE_LED
@@ -1896,12 +1902,6 @@ static struct ac97_quirk ac97_quirks[] __devinitdata = {
},
{
.subvendor = 0x103c,
- .subdevice = 0x0934,
- .name = "HP nx8220",
- .type = AC97_TUNE_MUTE_LED
- },
- {
- .subvendor = 0x103c,
.subdevice = 0x129d,
.name = "HP xw8000",
.type = AC97_TUNE_HP_ONLY