Merge branch 'fix/hda' into for-linus

74ce25c0 · Takashi Iwai · 86f2ce03 · 8ce28d6a · 74ce25c0
Commit 74ce25c0 authored Jan 31, 2010 by Takashi Iwai
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

sound/pci/hda/hda_intel.c sound/pci/hda/hda_intel.c +1 -0

No files found.
--- 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 */
 	{}
 };