---

yaml --- r: 6554 b: refs/heads/master c: 66d1064 h: refs/heads/master v: v3
git-mirror · Aug 30, 2005 · 726c5ce · 726c5ce
1 parent 9ac3a6b
commit 726c5ce
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5049c35b1389097a1c0c7686519928eaaf31e40b
+refs/heads/master: 66d10647feb32178e1204d5b5c7126b1731efe9c
diff --git a/trunk/sound/pci/ac97/ac97_patch.c b/trunk/sound/pci/ac97/ac97_patch.c
@@ -1629,6 +1629,7 @@ static void check_ad1981_hp_jack_sense(ac97_t *ac97)
 	u32 subid = ((u32)ac97->subsystem_vendor << 16) | ac97->subsystem_device;
 	switch (subid) {
 	case 0x103c0890: /* HP nc6000 */
+	case 0x103c099c: /* HP nx6110 */
 	case 0x103c006d: /* HP nx9105 */
 	case 0x17340088: /* FSC Scenic-W */
 		/* enable headphone jack sense */

diff --git a/trunk/sound/pci/intel8x0.c b/trunk/sound/pci/intel8x0.c
@@ -1824,6 +1824,12 @@ static struct ac97_quirk ac97_quirks[] __devinitdata = {
 		.name = "HP nc6000",
 		.type = AC97_TUNE_MUTE_LED
 	},
+	{
+		.subvendor = 0x103c,
+		.subdevice = 0x099c,
+		.name = "HP nx6110",	/* AD1981B */
+		.type = AC97_TUNE_HP_ONLY
+	},
 	{
 		.subvendor = 0x103c,
 		.subdevice = 0x129d,