diff options
author | 2013-04-23 19:26:00 +0100 | |
---|---|---|
committer | 2013-04-23 19:26:00 +0100 | |
commit | 9eb8ae727dcb9f2530a895ee6b3496592853709d (patch) | |
tree | 2d72cfcad6f9a79074eaf180033706fd8aa600b5 /sound/soc/fsl/Kconfig | |
parent | Merge remote-tracking branch 'asoc/topic/davinci' into asoc-next (diff) | |
parent | ASoC: generic-dmaengine-pcm: call dma_request_slave_channel() (diff) | |
download | linux-dev-9eb8ae727dcb9f2530a895ee6b3496592853709d.tar.xz linux-dev-9eb8ae727dcb9f2530a895ee6b3496592853709d.zip |
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 3b98159d9645..3843a18d4e56 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 |