From c992fcdbc7c0e63ca75e53125df6aebe9e0e4698 Mon Sep 17 00:00:00 2001
From: Ulrich Mueller <ulm@kph.uni-mainz.de>
Date: Wed, 4 Jan 2006 12:21:11 +0100
Subject: [PATCH] --- yaml --- r: 19537 b: refs/heads/master c:
 d82ed2ffc2839413c20b41a271a4d8db12b0683c h: refs/heads/master i:   19535:
 7d6cd8119d70b7dfaccc546708f1f9b9125be653 v: v3

---
 [refs]                     | 2 +-
 trunk/sound/pci/intel8x0.c | 8 +-------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index eb3083d8f062..3a6db5d8b910 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6c1080c1ea0ecdd541dac25e6550449390935db6
+refs/heads/master: d82ed2ffc2839413c20b41a271a4d8db12b0683c
diff --git a/trunk/sound/pci/intel8x0.c b/trunk/sound/pci/intel8x0.c
index 5466b1fa0cd5..2fe2a8ae82ce 100644
--- a/trunk/sound/pci/intel8x0.c
+++ b/trunk/sound/pci/intel8x0.c
@@ -1845,12 +1845,6 @@ static struct ac97_quirk ac97_quirks[] __devinitdata = {
 		.name = "HP nx8220",
 		.type = AC97_TUNE_MUTE_LED
 	},
-	{
-		.subvendor = 0x103c,
-		.subdevice = 0x099c,
-		.name = "HP nx6110",	/* AD1981B */
-		.type = AC97_TUNE_HP_ONLY
-	},
 	{
 		.subvendor = 0x103c,
 		.subdevice = 0x129d,
@@ -1866,7 +1860,7 @@ static struct ac97_quirk ac97_quirks[] __devinitdata = {
 	{
 		.subvendor = 0x103c,
 		.subdevice = 0x099c,
-		.name = "HP nc6120",
+		.name = "HP nx6110/nc6120",
 		.type = AC97_TUNE_HP_MUTE_LED
 	},
 	{