1 From 961a7aeafab477f63d9eef26afde9cbb8badcd0f Mon Sep 17 00:00:00 2001
2 From: Peter Ujfalusi <peter.ujfalusi@ti.com>
3 Date: Mon, 1 Oct 2012 12:29:26 +0300
4 Subject: [PATCH] ASoC: dmaengine: Correct Makefile when sound is built as
7 soc-dmaengine-pcm library need to be part of the snd-soc-core in order to
8 be able to compile ASoC as modules when dmaengine is enabled on the platform.
10 Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
11 Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
13 sound/soc/Makefile | 5 +++--
14 1 file changed, 3 insertions(+), 2 deletions(-)
16 diff --git a/sound/soc/Makefile b/sound/soc/Makefile
17 index bcbf1d0..99f32f7 100644
18 --- a/sound/soc/Makefile
19 +++ b/sound/soc/Makefile
21 snd-soc-core-objs := soc-core.o soc-dapm.o soc-jack.o soc-cache.o soc-utils.o
22 snd-soc-core-objs += soc-pcm.o soc-compress.o soc-io.o
24 -snd-soc-dmaengine-pcm-objs := soc-dmaengine-pcm.o
25 -obj-$(CONFIG_SND_SOC_DMAENGINE_PCM) += snd-soc-dmaengine-pcm.o
26 +ifneq ($(CONFIG_SND_SOC_DMAENGINE_PCM),)
27 +snd-soc-core-objs += soc-dmaengine-pcm.o
30 obj-$(CONFIG_SND_SOC) += snd-soc-core.o
31 obj-$(CONFIG_SND_SOC) += codecs/