diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-04-07 02:38:47 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-04-07 02:38:47 -0400 |
| commit | 92ab7b8f38db35db05bd9c44412fff08ad594ad4 (patch) | |
| tree | 21ad67eae1ce565566cb28a626673dfa153e865b /sound/pci/hda/hda_intel.c | |
| parent | c125ba3becb3cb93b2207cf06656aead6506de3d (diff) | |
| parent | f9700d5a4575e7fb343df10a1d29d425e4b81082 (diff) | |
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 b185afd581f1..6fe07d1c9de4 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 = { | |||
| 2366 | SND_PCI_QUIRK(0x1043, 0x81f6, "ASUS", 0), /* nvidia */ | 2366 | SND_PCI_QUIRK(0x1043, 0x81f6, "ASUS", 0), /* nvidia */ |
| 2367 | SND_PCI_QUIRK(0x1043, 0x822d, "ASUS", 0), /* Athlon64 X2 + nvidia MCP55 */ | 2367 | SND_PCI_QUIRK(0x1043, 0x822d, "ASUS", 0), /* Athlon64 X2 + nvidia MCP55 */ |
| 2368 | SND_PCI_QUIRK(0x1849, 0x0888, "ASRock", 0), /* Athlon64 X2 + nvidia */ | 2368 | SND_PCI_QUIRK(0x1849, 0x0888, "ASRock", 0), /* Athlon64 X2 + nvidia */ |
| 2369 | SND_PCI_QUIRK(0xa0a0, 0x0575, "Aopen MZ915-M", 0), /* ICH6 */ | ||
| 2369 | {} | 2370 | {} |
| 2370 | }; | 2371 | }; |
| 2371 | 2372 | ||