summaryrefslogtreecommitdiffstats
path: root/sound/soc/pxa
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-08-15 12:19:52 +0200
committerMark Brown <broonie@linaro.org>2013-08-15 12:19:52 +0200
commit4210606b19852dce52ed1a687db816695b6048e1 (patch)
treefd0762f88dc54560d87fc1e523741d92228f6a9c /sound/soc/pxa
parentASoC: mioa701_wm9713: Remove definition of ARRAY_AND_SIZE() (diff)
parentALSA: move dmaengine implementation from ASoC to ALSA core (diff)
downloadlinux-4210606b19852dce52ed1a687db816695b6048e1.tar.xz
linux-4210606b19852dce52ed1a687db816695b6048e1.zip
Merge branch 'topic/dma' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-pxa
Diffstat (limited to 'sound/soc/pxa')
-rw-r--r--sound/soc/pxa/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/pxa/Kconfig b/sound/soc/pxa/Kconfig
index b35809467547..4db74a083db1 100644
--- a/sound/soc/pxa/Kconfig
+++ b/sound/soc/pxa/Kconfig
@@ -11,7 +11,7 @@ config SND_PXA2XX_SOC
config SND_MMP_SOC
bool "Soc Audio for Marvell MMP chips"
depends on ARCH_MMP
- select SND_SOC_DMAENGINE_PCM
+ select SND_DMAENGINE_PCM
select SND_ARM
help
Say Y if you want to add support for codecs attached to