diff options
author | Takashi Iwai | 2017-12-20 17:36:04 +0100 |
---|---|---|
committer | Takashi Iwai | 2017-12-20 17:36:04 +0100 |
commit | 1e9a328e4b35af22c23ce9357c2c2a77159e74bb (patch) | |
tree | d04364bc2f892e1db6a4ec0edaccfbb782acd243 /sound/soc/atmel/Kconfig | |
parent | ALSA: usb-audio: Fix the missing ctl name suffix at parsing SU (diff) | |
parent | Merge remote-tracking branches 'asoc/fix/rt5663', 'asoc/fix/tlv320aic31xx' an... (diff) | |
download | kernel-qcow2-linux-1e9a328e4b35af22c23ce9357c2c2a77159e74bb.tar.gz kernel-qcow2-linux-1e9a328e4b35af22c23ce9357c2c2a77159e74bb.tar.xz kernel-qcow2-linux-1e9a328e4b35af22c23ce9357c2c2a77159e74bb.zip |
Merge tag 'asoc-fix-v4.15-rc4' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v4.15
This is a fairly large set of fixes, they've been delayed partly as more
and more keep coming in. Most of them are very small driver specific
fixes, the biggest individual thing is the revert of the rcar IOMMU
support - it was causing problems and there wasn't the confidence that
it could be resolved sensibly. There's also a relatively large change
in the Freescale SSI controller which resolves some issues with the
AC'97 mode, these aren't that large in the grand scheme of things and
reflect some fairly thorough review and testing.
Diffstat (limited to 'sound/soc/atmel/Kconfig')
-rw-r--r-- | sound/soc/atmel/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/atmel/Kconfig b/sound/soc/atmel/Kconfig index 4a56f3dfba51..dcee145dd179 100644 --- a/sound/soc/atmel/Kconfig +++ b/sound/soc/atmel/Kconfig @@ -64,7 +64,7 @@ config SND_AT91_SOC_SAM9X5_WM8731 config SND_ATMEL_SOC_CLASSD tristate "Atmel ASoC driver for boards using CLASSD" depends on ARCH_AT91 || COMPILE_TEST - select SND_ATMEL_SOC_DMA + select SND_SOC_GENERIC_DMAENGINE_PCM select REGMAP_MMIO help Say Y if you want to add support for Atmel ASoC driver for boards using |