diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-01-31 14:40:58 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-01-31 14:40:58 +0100 |
| commit | 74ce25c0ee757b0b9ea16a67a9ddc0ced192b030 (patch) | |
| tree | 2dfce608ac3ba62685c0bbb6c1fffa9cceecf51b /sound | |
| parent | Merge branch 'fix/hda' into for-linus (diff) | |
| parent | ALSA: hda - Add an ASUS mobo to MSI blacklist (diff) | |
| download | linux-74ce25c0ee757b0b9ea16a67a9ddc0ced192b030.tar.xz linux-74ce25c0ee757b0b9ea16a67a9ddc0ced192b030.zip | |
Merge branch 'fix/hda' into for-linus
Diffstat (limited to 'sound')
| -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 ec9c348336cc..565de38a3fc7 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 */ {} }; |