diff options
| author | Steve French <sfrench@us.ibm.com> | 2009-04-20 19:59:09 +0000 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2009-04-20 19:59:09 +0000 |
| commit | cbb7fe129bb2b836083ebcc256c43faff4b48cc2 (patch) | |
| tree | 65998c06e712be5f7cb72543a7c0cc2d0b1b4459 /sound/pci/intel8x0.c | |
| parent | 7b0c8fcff47a885743125dd843db64af41af5a61 (diff) | |
| parent | a939b96cccdb65df80a52447ec8e4a6d79c56dbb (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'sound/pci/intel8x0.c')
| -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 5dced5b7938..8042d539889 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 |