diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-04-19 11:39:57 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-04-19 11:39:57 +0200 |
| commit | 81584a079fc7a18b53fc7db4232419a8faadd414 (patch) | |
| tree | 6b3c8160d4744e46eb2cc9378bf53d5c42227d27 | |
| parent | 7c4112a285b00e137db04844b8b9b478e5d4363e (diff) | |
| parent | c82834251ceb81b7575927c767500bd8c4a7f928 (diff) | |
| download | op-kernel-dev-81584a079fc7a18b53fc7db4232419a8faadd414.zip op-kernel-dev-81584a079fc7a18b53fc7db4232419a8faadd414.tar.gz | |
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
| -rw-r--r-- | sound/pci/intel8x0.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sound/pci/intel8x0.c b/sound/pci/intel8x0.c index 5dced5b..8042d53 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 |
