[PATCH] [UBUNTU:sound/pci/] #63573: Fix MUTE_LED quirk for HP NX 6120

[crimsun at fungus.sh.nu]

From c7a2add232ab79a22be89ad003f7ece21a129e2c Mon Sep 17 00:00:00 2001
From: Daniel T. Chen <crimsun at garnish.localdomain>
Date: Tue, 3 Oct 2006 17:18:32 -0400
Subject: [PATCH] [UBUNTU:sound/pci/] #63573: Fix MUTE_LED quirk for HP NX 6120

UpstreamStatus: Exists already

This commit removes a conflicting duplicate entry for the 0x103c099c
device (HP NX 6110/NX 6120/NC 6120), closing Ubuntu: #63573.

This commit is applicable to both Dapper and Edgy linux-source.

Signed-off-by: Daniel T Chen <crimsun at ubuntu.com>
---
 sound/pci/intel8x0.c |   10 ++--------
 1 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/sound/pci/intel8x0.c b/sound/pci/intel8x0.c
index 0450f60..e483387 100644
--- a/sound/pci/intel8x0.c
+++ b/sound/pci/intel8x0.c
@@ -1812,12 +1812,6 @@ static struct ac97_quirk ac97_quirks[] _
 	},
 	{
 		.subvendor = 0x103c,
-		.subdevice = 0x099c,
-		.name = "HP nx6110",	/* AD1981B */
-		.type = AC97_TUNE_HP_ONLY
-	},
-	{
-		.subvendor = 0x103c,
 		.subdevice = 0x129d,
 		.name = "HP xw8000",
 		.type = AC97_TUNE_HP_ONLY
@@ -1831,8 +1825,8 @@ static struct ac97_quirk ac97_quirks[] _
 	{
 		.subvendor = 0x103c,
 		.subdevice = 0x099c,
-		.name = "HP nc6120",
-		.type = AC97_TUNE_HP_MUTE_LED
+		.name = "HP nc6120", /* nx6110 - and nx6120, too? */
+		.type = AC97_TUNE_HP_MUTE_LED /* Malone #63573 */
 	},
 	{
 		.subvendor = 0x103c,
-- 
1.4.1

-- 
Daniel T. Chen            crimsun at ubuntu.com
GPG key:  0xC88ABDA3
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/kernel-team/attachments/20061003/f78fb6e9/attachment.sig>