---

yaml --- r: 187007 b: refs/heads/master c: 4193d13 h: refs/heads/master i: 187005: d796b9b 187003: 6e68458 186999: 0db576f 186991: 1dd6101 186975: e180ac5 186943: 841bd9b 186879: a1f85e1 v: v3
git-mirror · Mar 7, 2010 · 1e27aab · 1e27aab
1 parent 0cb6a87
commit 1e27aab
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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
@@ -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 */
 	{}
 };