---

yaml --- r: 334465 b: refs/heads/master c: 961a7ae h: refs/heads/master i: 334463: ab032dc v: v3
git-mirror · Oct 9, 2012 · f8ff2ff · f8ff2ff
1 parent 0595890
commit f8ff2ff
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 57451e437796548d658d03c2c4aab659eafcd799
+refs/heads/master: 961a7aeafab477f63d9eef26afde9cbb8badcd0f
diff --git a/trunk/sound/soc/Makefile b/trunk/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/