From 1e27aab70eccb6a3339db61b82f7afdd88dd631e Mon Sep 17 00:00:00 2001
From: Michele Ballabio <barra_cuda@katamail.com>
Date: Sat, 6 Mar 2010 21:06:46 +0100
Subject: [PATCH] --- yaml --- r: 187007 b: refs/heads/master c:
 4193d13b2c2b694aa59e629e6daf6269d7922f13 h: refs/heads/master i:   187005:
 d796b9bfb3760514d6bb28fbec7c0f7e4eb173ff   187003:
 6e68458798b684487c02077ccd9d97e985163f89   186999:
 0db576fb1807be66a3ac02a362e46a241c84de96   186991:
 1dd6101f47b5ed564b2deeeca3b899454773da75   186975:
 e180ac5e7f3c2f2740f1dd62216dff98bea0f3a5   186943:
 841bd9bb50fc14d020f9020baa4f8a8eaad33071   186879:
 a1f85e1968d08f80d26248ee94a3e20edffa3efe v: v3

---
 [refs]                          | 2 +-
 trunk/sound/pci/hda/hda_intel.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index cbade0746dba..a00a31388949 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7484399fe2f85212754ffdd78121636b47a49a13
+refs/heads/master: 4193d13b2c2b694aa59e629e6daf6269d7922f13
diff --git a/trunk/sound/pci/hda/hda_intel.c b/trunk/sound/pci/hda/hda_intel.c
index 94b444e6fed3..e37bffec749a 100644
--- a/trunk/sound/pci/hda/hda_intel.c
+++ b/trunk/sound/pci/hda/hda_intel.c
@@ -2358,6 +2358,7 @@ static void __devinit check_probe_mask(struct azx *chip, int dev)
 static struct snd_pci_quirk msi_black_list[] __devinitdata = {
 	SND_PCI_QUIRK(0x1043, 0x81f2, "ASUS", 0), /* Athlon64 X2 + nvidia */
 	SND_PCI_QUIRK(0x1043, 0x81f6, "ASUS", 0), /* nvidia */
+	SND_PCI_QUIRK(0x1849, 0x0888, "ASRock", 0), /* Athlon64 X2 + nvidia */
 	{}
 };