diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-01-31 08:40:58 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-01-31 08:40:58 -0500 |
| commit | 74ce25c0ee757b0b9ea16a67a9ddc0ced192b030 (patch) | |
| tree | 2dfce608ac3ba62685c0bbb6c1fffa9cceecf51b | |
| parent | 86f2ce0347e9abae23e9106259602298f6732a90 (diff) | |
| parent | 8ce28d6abff34886d3797b25324c940471b99164 (diff) | |
Merge branch 'fix/hda' into for-linus
| -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 ec9c348336cc..565de38a3fc7 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c | |||
| @@ -2332,6 +2332,7 @@ static void __devinit check_probe_mask(struct azx *chip, int dev) | |||
| 2332 | */ | 2332 | */ |
| 2333 | static struct snd_pci_quirk msi_black_list[] __devinitdata = { | 2333 | static struct snd_pci_quirk msi_black_list[] __devinitdata = { |
| 2334 | SND_PCI_QUIRK(0x1043, 0x81f2, "ASUS", 0), /* Athlon64 X2 + nvidia */ | 2334 | SND_PCI_QUIRK(0x1043, 0x81f2, "ASUS", 0), /* Athlon64 X2 + nvidia */ |
| 2335 | SND_PCI_QUIRK(0x1043, 0x829c, "ASUS", 0), /* nvidia */ | ||
| 2335 | {} | 2336 | {} |
| 2336 | }; | 2337 | }; |
| 2337 | 2338 | ||