hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix/hda' into for-linus

This commit is contained in:
Takashi Iwai 2010-01-31 14:40:58 +01:00
parent 86f2ce0347 8ce28d6abf
commit 74ce25c0ee
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sound/pci/hda/hda_intel.c
View File

@ -2332,6 +2332,7 @@ static void __devinit check_probe_mask(struct azx *chip, int dev)
*/ */
static struct snd_pci_quirk msi_black_list[] __devinitdata = { static struct snd_pci_quirk msi_black_list[] __devinitdata = {
SND_PCI_QUIRK(0x1043, 0x81f2, "ASUS", 0), /* Athlon64 X2 + nvidia */ SND_PCI_QUIRK(0x1043, 0x81f2, "ASUS", 0), /* Athlon64 X2 + nvidia */
SND_PCI_QUIRK(0x1043, 0x829c, "ASUS", 0), /* nvidia */
{} {}
}; };