diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-12 08:52:41 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-12 08:52:41 -0700 |
| commit | decf7abcc97444ecd2d3cf278f5cc8093f33f49a (patch) | |
| tree | 735057e504a1787a741f6a15fac7dbe2f461e887 /sound/pci/hda/hda_intel.c | |
| parent | 24ba40588fe50adce2a99e026fc0026872ebeb85 (diff) | |
| parent | 3d0049e8529adaa36c38a7b400792f6c37b66c92 (diff) | |
| download | blackbird-op-linux-decf7abcc97444ecd2d3cf278f5cc8093f33f49a.tar.gz blackbird-op-linux-decf7abcc97444ecd2d3cf278f5cc8093f33f49a.zip | |
Merge tag 'sound-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
Pull sound fixes from Takashi Iwai:
"A few last-minute fixes for 3.12-rc1. All patches are driver
specific.
- HD-audio fixes: MacBook 6,1/6,2 speaker fix, ASUS TX300 dock
speaker fix, Toshiba Satellite irq fix, Haswell HDMI audio
cleanups)
- ASoC fixes: atmel irq fix, fsl DT fix, mc13783 spi fix, kirkwood
compatible string change, etc"
* tag 'sound-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
ASoC: mc13783: add spi errata fix
ASoC: rsnd: fixup flag name of rsnd_scu_platform_info
ALSA: hda - Add CS4208 codec support for MacBook 6,1 and 6,2
ALSA: hda - Add Toshiba Satellite C870 to MSI blacklist
ASoC: fsl_spdif: Select regmap-mmio
ALSA: hda - unmute pin amplifier in infoframe setup for Haswell
ALSA: hda - define is_haswell() to check if a display audio codec is Haswell
ALSA: hda - Add dock speaker support for ASUS TX300
ASoC: kirkwood: change the compatible string of the kirkwood-i2s driver
ASoC: atmel: disable error interrupt
ASoC: fsl: imx-audmux: Do not call imx_audmux_parse_dt_defaults() on non-dt kernel
Diffstat (limited to 'sound/pci/hda/hda_intel.c')
| -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 e54ebd530849..6e61a019aa5e 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -3428,6 +3428,7 @@ static struct snd_pci_quirk msi_black_list[] = { SND_PCI_QUIRK(0x1043, 0x81f2, "ASUS", 0), /* Athlon64 X2 + nvidia */ SND_PCI_QUIRK(0x1043, 0x81f6, "ASUS", 0), /* nvidia */ SND_PCI_QUIRK(0x1043, 0x822d, "ASUS", 0), /* Athlon64 X2 + nvidia MCP55 */ + SND_PCI_QUIRK(0x1179, 0xfb44, "Toshiba Satellite C870", 0), /* AMD Hudson */ SND_PCI_QUIRK(0x1849, 0x0888, "ASRock", 0), /* Athlon64 X2 + nvidia */ SND_PCI_QUIRK(0xa0a0, 0x0575, "Aopen MZ915-M", 0), /* ICH6 */ {} |
