summaryrefslogtreecommitdiffstats
path: root/sound/core/Makefile
diff options
context:
space:
mode:
authorDaniel Mack <zonque@gmail.com>2013-08-12 10:42:37 +0200
committerMark Brown <broonie@linaro.org>2013-08-15 11:18:09 +0100
commitb7ae6f31d8243ec684af16bc5c763eccdfabaec0 (patch)
tree09bcafcf065ffe743258f8ffbf6c055a1c130b4f /sound/core/Makefile
parentd4e4ab86bcba5a72779c43dc1459f71fea3d89c8 (diff)
downloadlinux-stable-b7ae6f31d8243ec684af16bc5c763eccdfabaec0.tar.gz
linux-stable-b7ae6f31d8243ec684af16bc5c763eccdfabaec0.tar.bz2
linux-stable-b7ae6f31d8243ec684af16bc5c763eccdfabaec0.zip
ALSA: move dmaengine implementation from ASoC to ALSA core
For the PXA DMA rework, we need the generic dmaengine implementation that currently lives in sound/soc for standalone (non-ASoC) AC'97 support. Move it to sound/core, and rename the Kconfig symbol. Signed-off-by: Daniel Mack <zonque@gmail.com> Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound/core/Makefile')
-rw-r--r--sound/core/Makefile3
1 files changed, 3 insertions, 0 deletions
diff --git a/sound/core/Makefile b/sound/core/Makefile
index 43d4117428ac..5e890cfed423 100644
--- a/sound/core/Makefile
+++ b/sound/core/Makefile
@@ -13,6 +13,8 @@ snd-$(CONFIG_SND_JACK) += jack.o
snd-pcm-objs := pcm.o pcm_native.o pcm_lib.o pcm_timer.o pcm_misc.o \
pcm_memory.o
+snd-pcm-dmaengine-objs := pcm_dmaengine.o
+
snd-page-alloc-y := memalloc.o
snd-page-alloc-$(CONFIG_SND_DMA_SGBUF) += sgbuf.o
@@ -30,6 +32,7 @@ obj-$(CONFIG_SND_TIMER) += snd-timer.o
obj-$(CONFIG_SND_HRTIMER) += snd-hrtimer.o
obj-$(CONFIG_SND_RTCTIMER) += snd-rtctimer.o
obj-$(CONFIG_SND_PCM) += snd-pcm.o snd-page-alloc.o
+obj-$(CONFIG_SND_DMAENGINE_PCM) += snd-pcm-dmaengine.o
obj-$(CONFIG_SND_RAWMIDI) += snd-rawmidi.o
obj-$(CONFIG_SND_OSSEMUL) += oss/