summaryrefslogtreecommitdiffstats
path: root/sound/pci/hda/hda_intel.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2010-04-07 08:38:47 +0200
committerTakashi Iwai <tiwai@suse.de>2010-04-07 08:38:47 +0200
commit92ab7b8f38db35db05bd9c44412fff08ad594ad4 (patch)
tree21ad67eae1ce565566cb28a626673dfa153e865b /sound/pci/hda/hda_intel.c
parentc125ba3becb3cb93b2207cf06656aead6506de3d (diff)
parentf9700d5a4575e7fb343df10a1d29d425e4b81082 (diff)
downloadop-kernel-dev-92ab7b8f38db35db05bd9c44412fff08ad594ad4.zip
op-kernel-dev-92ab7b8f38db35db05bd9c44412fff08ad594ad4.tar.gz
Merge branch 'fix/hda' into topic/hda
Diffstat (limited to 'sound/pci/hda/hda_intel.c')
-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 b185afd..6fe07d1 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -2366,6 +2366,7 @@ static struct snd_pci_quirk msi_black_list[] __devinitdata = {
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 */
+ SND_PCI_QUIRK(0xa0a0, 0x0575, "Aopen MZ915-M", 0), /* ICH6 */
{}
};
OpenPOWER on IntegriCloud