Commit 81584a07 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'fix/intel8x0' into for-linus 

* fix/intel8x0:
  ALSA: Intel8x0: Add hp_only quirk for SSID 0x1028016a (Dell Inspiron 8600)
  ALSA: Intel8x0: Remove conflicting quirk for SSID 0x103c0934
parents 7c4112a2 c8283425

sound/pci/intel8x0.c

+6 −6
Original line number Diff line number Diff line
@@ -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,