diff options
| author | Takashi Iwai | 2009-12-23 08:38:23 +0100 |
|---|---|---|
| committer | Takashi Iwai | 2009-12-23 08:38:23 +0100 |
| commit | 524027916e5763a0c9a7da80aa8dd013a14a0440 (patch) | |
| tree | ed576766b050122065f5c548adb22f9ce277a2a0 /sound/pci/hda/hda_intel.c | |
| parent | ALSA: hda - Add Bass Speaker switch for HP dv7 (diff) | |
| parent | ALSA: hda - Add MSI blacklist (diff) | |
| download | kernel-qcow2-linux-524027916e5763a0c9a7da80aa8dd013a14a0440.tar.gz kernel-qcow2-linux-524027916e5763a0c9a7da80aa8dd013a14a0440.tar.xz kernel-qcow2-linux-524027916e5763a0c9a7da80aa8dd013a14a0440.zip | |
Merge branch 'fix/hda' into topic/hda
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 93eaf4fc39be..d258569fc921 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 */ {} }; |