Merge branch 'fix/hda' into for-linus

2010-01-31 14:40:58 +01:00 · 2010-01-31 14:40:58 +01:00 · 74ce25c0ee
parent 86f2ce0347 8ce28d6abf
commit 74ce25c0ee
1 changed files with 1 additions and 0 deletions
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@ -2332,6 +2332,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, 0x829c, "ASUS", 0), /* nvidia */
 	{}
 };