From 97b95dcc9fe1308ad22510867d8cfbf8ab1b76a3 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.de>
Date: Tue, 18 Apr 2006 12:50:40 +0200
Subject: [PATCH] --- yaml --- r: 26325 b: refs/heads/master c:
 8970ccda1ae3c3b4ddd5ce366ca2cd88356d664e h: refs/heads/master i:   26323:
 64a7731e9ac4d6ec1c003250debe35e9d80e43b3 v: v3

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

diff --git a/[refs] b/[refs]
index fec925091695..f89bae133aa3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a182ee9876c7826d0b8f7789cb5c38c5bfbec441
+refs/heads/master: 8970ccda1ae3c3b4ddd5ce366ca2cd88356d664e
diff --git a/trunk/sound/pci/hda/patch_analog.c b/trunk/sound/pci/hda/patch_analog.c
index bcfca159c6a2..fedac28c7293 100644
--- a/trunk/sound/pci/hda/patch_analog.c
+++ b/trunk/sound/pci/hda/patch_analog.c
@@ -1330,12 +1330,8 @@ enum { AD1981_BASIC, AD1981_HP };
 
 static struct hda_board_config ad1981_cfg_tbl[] = {
 	{ .modelname = "hp", .config = AD1981_HP },
-	{ .pci_subvendor = 0x103c, .pci_subdevice = 0x30aa,
-	  .config = AD1981_HP }, /* HP nx6320 */
-	{ .pci_subvendor = 0x103c, .pci_subdevice = 0x309f,
-	  .config = AD1981_HP }, /* HP nx9420 AngelFire */
-	{ .pci_subvendor = 0x103c, .pci_subdevice = 0x30a2,
-	  .config = AD1981_HP }, /* HP nx9420 AngelFire */
+	/* All HP models */
+	{ .pci_subvendor = 0x103c, .config = AD1981_HP },
 	{ .modelname = "basic", .config = AD1981_BASIC },
 	{}
 };