Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 74ce25c0 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'fix/hda' into for-linus

parents 86f2ce03 8ce28d6a

sound/pci/hda/hda_intel.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -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 */

	{}

	{}

};

};