summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorPeter Ujfalusi <peter.ujfalusi@ti.com>2012-10-01 11:29:26 +0200
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-10-09 08:57:33 +0200
commit961a7aeafab477f63d9eef26afde9cbb8badcd0f (patch)
tree7dfbff248c5fb065ae6d45fbc754ea592d48f27a /sound
parentASoC: fsi: don't reschedule DMA from an atomic context (diff)
downloadlinux-961a7aeafab477f63d9eef26afde9cbb8badcd0f.tar.xz
linux-961a7aeafab477f63d9eef26afde9cbb8badcd0f.zip
ASoC: dmaengine: Correct Makefile when sound is built as module
soc-dmaengine-pcm library need to be part of the snd-soc-core in order to be able to compile ASoC as modules when dmaengine is enabled on the platform. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/Makefile5
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/soc/Makefile b/sound/soc/Makefile
index bcbf1d00aa85..99f32f7c0692 100644
--- a/sound/soc/Makefile
+++ b/sound/soc/Makefile
@@ -1,8 +1,9 @@
snd-soc-core-objs := soc-core.o soc-dapm.o soc-jack.o soc-cache.o soc-utils.o
snd-soc-core-objs += soc-pcm.o soc-compress.o soc-io.o
-snd-soc-dmaengine-pcm-objs := soc-dmaengine-pcm.o
-obj-$(CONFIG_SND_SOC_DMAENGINE_PCM) += snd-soc-dmaengine-pcm.o
+ifneq ($(CONFIG_SND_SOC_DMAENGINE_PCM),)
+snd-soc-core-objs += soc-dmaengine-pcm.o
+endif
obj-$(CONFIG_SND_SOC) += snd-soc-core.o
obj-$(CONFIG_SND_SOC) += codecs/