tree e64794c6a8341c9310a40c3552ee62196a97ebae
parent 6c1080c1ea0ecdd541dac25e6550449390935db6
author Ulrich Mueller <ulm@kph.uni-mainz.de> 1136373671 +0100
committer Jaroslav Kysela <perex@suse.cz> 1137943426 +0100

[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>