Browse Source

Merge branch 'fix/hda' into for-linus

Takashi Iwai 15 years ago
parent
commit
74ce25c0ee
1 changed files with 1 additions and 0 deletions
  1. 1 0
      sound/pci/hda/hda_intel.c

+ 1 - 0
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 */
 	{}
 };