]> nv-tegra.nvidia Code Review - linux-3.10.git/blobdiff - sound/pci/intel8x0.c
Merge commit 'alsa/master' into for-linus
[linux-3.10.git] / sound / pci / intel8x0.c
index c4ba486785c68e58e9f4b60f5413df8309800648..173bebf9f51d0316f00a158912c2dd0eeacc9f8d 100644 (file)
@@ -1852,6 +1852,12 @@ static struct ac97_quirk ac97_quirks[] __devinitdata = {
                .name = "Dell Unknown", /* STAC9750/51 */
                .type = AC97_TUNE_HP_ONLY
        },
                .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,
        {
                .subvendor = 0x1028,
                .subdevice = 0x0186,
@@ -1894,12 +1900,6 @@ static struct ac97_quirk ac97_quirks[] __devinitdata = {
                .name = "HP nc6000",
                .type = AC97_TUNE_MUTE_LED
        },
                .name = "HP nc6000",
                .type = AC97_TUNE_MUTE_LED
        },
-       {
-               .subvendor = 0x103c,
-               .subdevice = 0x0934,
-               .name = "HP nx8220",
-               .type = AC97_TUNE_MUTE_LED
-       },
        {
                .subvendor = 0x103c,
                .subdevice = 0x129d,
        {
                .subvendor = 0x103c,
                .subdevice = 0x129d,