| commit | 74ce25c0ee757b0b9ea16a67a9ddc0ced192b030 | [log] [tgz] |
|---|---|---|
| author | Takashi Iwai <tiwai@suse.de> | Sun Jan 31 14:40:58 2010 +0100 |
| committer | Takashi Iwai <tiwai@suse.de> | Sun Jan 31 14:40:58 2010 +0100 |
| tree | 2dfce608ac3ba62685c0bbb6c1fffa9cceecf51b | |
| parent | 86f2ce0347e9abae23e9106259602298f6732a90 [diff] | |
| parent | 8ce28d6abff34886d3797b25324c940471b99164 [diff] |
Merge branch 'fix/hda' into for-linus
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index ec9c348..565de38 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c
@@ -2332,6 +2332,7 @@ */ 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 */ {} };