diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-12-23 18:50:17 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-12-23 18:50:17 +0100 |
commit | 54a26089a2733df2765342acaaf71466d37ff5a5 (patch) | |
tree | 9779d54ac78d3b9fc8d9b5d9e8cc76dc362699fb /sound/pci/hda/hda_intel.c | |
parent | 3095b165a14b1a95eb500bcaf13ad725a27fe825 (diff) | |
parent | 95e70e87533f9d117d369495ee633cb7d18dc802 (diff) | |
download | talos-op-linux-54a26089a2733df2765342acaaf71466d37ff5a5.tar.gz talos-op-linux-54a26089a2733df2765342acaaf71466d37ff5a5.zip |
Merge branch 'fix/hda' into for-linus
Diffstat (limited to 'sound/pci/hda/hda_intel.c')
-rw-r--r-- | sound/pci/hda/hda_intel.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index 9b56f937913e..ff8ad46cc50e 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -2322,6 +2322,7 @@ static void __devinit check_probe_mask(struct azx *chip, int dev) * white/black-list for enable_msi */ static struct snd_pci_quirk msi_black_list[] __devinitdata = { + SND_PCI_QUIRK(0x1043, 0x81f2, "ASUS", 0), /* Athlon64 X2 + nvidia */ {} }; |