diff options
| author | Peter Ujfalusi <peter.ujfalusi@ti.com> | 2012-10-01 12:29:26 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-12-17 10:37:43 -0800 |
| commit | a11bf0aa146b60e917dc30348e301d6a7d13dcbd (patch) | |
| tree | 722fc31b46b78e75c8f554661720098995de9209 /sound | |
| parent | 1b59789b7d3aca70cca0a7b66e57a4a78fcd12d4 (diff) | |
| download | linux-3.10-a11bf0aa146b60e917dc30348e301d6a7d13dcbd.tar.gz linux-3.10-a11bf0aa146b60e917dc30348e301d6a7d13dcbd.tar.bz2 linux-3.10-a11bf0aa146b60e917dc30348e301d6a7d13dcbd.zip | |
ASoC: dmaengine: Correct Makefile when sound is built as module
commit 961a7aeafab477f63d9eef26afde9cbb8badcd0f upstream.
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>
Cc: Florian Fainelli <florian@openwrt.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/soc/Makefile b/sound/soc/Makefile index 2feaf376e94..0f370861bba 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-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/ |