diff options
author | Mark Brown | 2018-01-12 19:59:19 +0100 |
---|---|---|
committer | Mark Brown | 2018-01-12 19:59:19 +0100 |
commit | 9d66a875ecc7d6dd414121e4508340d6c08f51b0 (patch) | |
tree | d446bb455780d9058efe1760745bfb63207090de /sound/soc/atmel | |
parent | ASoC: sn95031: remove this code (diff) | |
parent | gpio: merrifield: Add support of ACPI enabled platforms (diff) | |
download | kernel-qcow2-linux-9d66a875ecc7d6dd414121e4508340d6c08f51b0.tar.gz kernel-qcow2-linux-9d66a875ecc7d6dd414121e4508340d6c08f51b0.tar.xz kernel-qcow2-linux-9d66a875ecc7d6dd414121e4508340d6c08f51b0.zip |
Merge branch 'acpi-gpio' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm into asoc-intel
Diffstat (limited to 'sound/soc/atmel')
-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 |