]> nv-tegra.nvidia Code Review - linux-2.6.git/commitdiff
Merge branch 'fix/intel8x0' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Sun, 19 Apr 2009 09:39:57 +0000 (11:39 +0200)
committerTakashi Iwai <tiwai@suse.de>
Sun, 19 Apr 2009 09:39:57 +0000 (11:39 +0200)
* fix/intel8x0:
  ALSA: Intel8x0: Add hp_only quirk for SSID 0x1028016a (Dell Inspiron 8600)
  ALSA: Intel8x0: Remove conflicting quirk for SSID 0x103c0934

sound/pci/intel8x0.c

index 5dced5b793873409f32bd20f3e06588de8dfb662..8042d539889227ca6ab46e23b981661cffde18b2 100644 (file)
@@ -1852,6 +1852,12 @@ static struct ac97_quirk ac97_quirks[] __devinitdata = {
                .name = "Dell Unknown", /* STAC9750/51 */
                .type = AC97_TUNE_HP_ONLY
        },
+       {
+               .subvendor = 0x1028,
+               .subdevice = 0x016a,
+               .name = "Dell Inspiron 8600",   /* STAC9750/51 */
+               .type = AC97_TUNE_HP_ONLY
+       },
        {
                .subvendor = 0x1028,
                .subdevice = 0x0186,
@@ -1894,12 +1900,6 @@ static struct ac97_quirk ac97_quirks[] __devinitdata = {
                .name = "HP nc6000",
                .type = AC97_TUNE_MUTE_LED
        },
-       {
-               .subvendor = 0x103c,
-               .subdevice = 0x0934,
-               .name = "HP nx8220",
-               .type = AC97_TUNE_MUTE_LED
-       },
        {
                .subvendor = 0x103c,
                .subdevice = 0x129d,