summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUlrich Mueller <ulm@kph.uni-mainz.de>2006-01-04 12:21:11 +0100
committerJaroslav Kysela <perex@suse.cz>2006-01-22 16:23:46 +0100
commitd82ed2ffc2839413c20b41a271a4d8db12b0683c (patch)
treee64794c6a8341c9310a40c3552ee62196a97ebae
parent6c1080c1ea0ecdd541dac25e6550449390935db6 (diff)
downloadblackbird-op-linux-d82ed2ffc2839413c20b41a271a4d8db12b0683c.tar.gz
blackbird-op-linux-d82ed2ffc2839413c20b41a271a4d8db12b0683c.zip
[ALSA] intel8x0 - Fix duplicate ac97_quirks entry
Modules: Intel8x0 driver in recent -mm kernels additional quirks for ac97 hardware in HP laptops have been added. However, now the list in intel8x0.c contains a duplicate, since the HP nx6110 and nc6120 have identical subdevice ids. This was introduced in -mm1 by the following patch: add-new-quirk-for-devices-with-mute-leds-and-separate-headphone-volume.patch Since the HP nx6110 and nc6120 are almost identical, both entries should really be combined, as in the following patch. I have checked that AC97_TUNE_HP_MUTE_LED is the right thing to do. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r--sound/pci/intel8x0.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/sound/pci/intel8x0.c b/sound/pci/intel8x0.c
index 5466b1fa0cd5..2fe2a8ae82ce 100644
--- a/sound/pci/intel8x0.c
+++ b/sound/pci/intel8x0.c
@@ -1847,12 +1847,6 @@ static struct ac97_quirk ac97_quirks[] __devinitdata = {
},
{
.subvendor = 0x103c,
- .subdevice = 0x099c,
- .name = "HP nx6110", /* AD1981B */
- .type = AC97_TUNE_HP_ONLY
- },
- {
- .subvendor = 0x103c,
.subdevice = 0x129d,
.name = "HP xw8000",
.type = AC97_TUNE_HP_ONLY
@@ -1866,7 +1860,7 @@ static struct ac97_quirk ac97_quirks[] __devinitdata = {
{
.subvendor = 0x103c,
.subdevice = 0x099c,
- .name = "HP nc6120",
+ .name = "HP nx6110/nc6120",
.type = AC97_TUNE_HP_MUTE_LED
},
{
OpenPOWER on IntegriCloud