diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-15 22:54:18 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-15 22:54:18 -0500 |
| commit | d277993f78b8a5376477c487208d82bc4fecab95 (patch) | |
| tree | fba9ac78f7cbea7f62f1f1f983df2f2663746f1f | |
| parent | 65d269538a1129495ac45a14a777cd11cfe881d8 (diff) | |
| parent | 0a27fcfaaf61108d94f0377f91bed81b2dd35f52 (diff) | |
Merge branch 'fix/hda' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'fix/hda' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
ALSA: hda - Correct ASUA blacklist for MSI brokenness
| -rw-r--r-- | sound/pci/hda/hda_intel.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index 3600e9cc9bc6..ff6da6f386d1 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c | |||
| @@ -2350,7 +2350,7 @@ static void __devinit check_probe_mask(struct azx *chip, int dev) | |||
| 2350 | */ | 2350 | */ |
| 2351 | static struct snd_pci_quirk msi_black_list[] __devinitdata = { | 2351 | static struct snd_pci_quirk msi_black_list[] __devinitdata = { |
| 2352 | SND_PCI_QUIRK(0x1043, 0x81f2, "ASUS", 0), /* Athlon64 X2 + nvidia */ | 2352 | SND_PCI_QUIRK(0x1043, 0x81f2, "ASUS", 0), /* Athlon64 X2 + nvidia */ |
| 2353 | SND_PCI_QUIRK(0x1043, 0x829c, "ASUS", 0), /* nvidia */ | 2353 | SND_PCI_QUIRK(0x1043, 0x81f6, "ASUS", 0), /* nvidia */ |
| 2354 | {} | 2354 | {} |
| 2355 | }; | 2355 | }; |
| 2356 | 2356 | ||