diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-04-18 14:05:30 (GMT) |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-04-18 14:05:30 (GMT) |
commit | d45a26bd9790fcde58cf4b11a775ff56c6b44e0b (patch) | |
tree | 71b75e94b7a586123331eed46e91d25dd88ff52a /sound/soc/fsl/Kconfig | |
parent | 8ef53f689afea7f2da360cb27d7af040c1216bfa (diff) | |
parent | 22f38f792ec53e2a93be13ecb609bbe911ed8ff9 (diff) | |
download | linux-fsl-qoriq-d45a26bd9790fcde58cf4b11a775ff56c6b44e0b.tar.xz |
Merge remote-tracking branch 'asoc/topic/dma' into asoc-next
Diffstat (limited to 'sound/soc/fsl/Kconfig')
-rw-r--r-- | sound/soc/fsl/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/fsl/Kconfig b/sound/soc/fsl/Kconfig index 3b98159..3843a18 100644 --- a/sound/soc/fsl/Kconfig +++ b/sound/soc/fsl/Kconfig @@ -118,7 +118,7 @@ config SND_SOC_IMX_PCM_FIQ config SND_SOC_IMX_PCM_DMA bool - select SND_SOC_DMAENGINE_PCM + select SND_SOC_GENERIC_DMAENGINE_PCM select SND_SOC_IMX_PCM config SND_SOC_IMX_AUDMUX |