aboutsummaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2010-01-31 14:40:58 +0100
committerTakashi Iwai <tiwai@suse.de>2010-01-31 14:40:58 +0100
commit74ce25c0ee757b0b9ea16a67a9ddc0ced192b030 (patch)
tree2dfce608ac3ba62685c0bbb6c1fffa9cceecf51b /sound
parent86f2ce0347e9abae23e9106259602298f6732a90 (diff)
parent8ce28d6abff34886d3797b25324c940471b99164 (diff)
downloadlinux-2.6.34-ux500-74ce25c0ee757b0b9ea16a67a9ddc0ced192b030.tar.gz
Merge branch 'fix/hda' into for-linus
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/hda/hda_intel.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index ec9c348336c..565de38a3fc 100644
--- 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 */
{}
};