Merge branch 'fix/hda' into for-linus
This commit is contained in:
commit
74ce25c0ee
@ -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 */
|
||||
{}
|
||||
};
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user