Merge branch 'fix/hda' into for-linus

mariux64 · Jan 31, 2010 · 74ce25c · 74ce25c
2 parents 86f2ce0 + 8ce28d6
commit 74ce25c
Showing 1 changed file with 1 addition and 0 deletions.
diff --git 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 */
 	{}
 };