diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-03-10 09:01:25 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-03-10 09:01:25 +0100 |
| commit | 7d39cf62242d52729ddff9a9ae195669f462d5c4 (patch) | |
| tree | 64f8d744f0a19f204e700674b5a967ddfd741050 /sound/pci/hda/hda_intel.c | |
| parent | a3087ae970e5c8984fab2306b1f4dbe5ef132ff7 (diff) | |
| parent | ecd216260f87dd8c14b2580a16f055554644bbea (diff) | |
Merge branch 'topic/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 43b7cfb7cff..da1ac9068aa 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -2358,6 +2358,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, 0x81f6, "ASUS", 0), /* nvidia */ + SND_PCI_QUIRK(0x1043, 0x822d, "ASUS", 0), /* Athlon64 X2 + nvidia MCP55 */ SND_PCI_QUIRK(0x1849, 0x0888, "ASRock", 0), /* Athlon64 X2 + nvidia */ {} }; |