]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
ASoC: fsl: fix miscompilation of snd-soc-imx-pcm
authorLothar Waßmann <LW@KARO-electronics.de>
Tue, 20 Nov 2012 14:02:48 +0000 (15:02 +0100)
committerLothar Waßmann <LW@KARO-electronics.de>
Tue, 20 Nov 2012 14:02:48 +0000 (15:02 +0100)
Due to a broken make rule, imx-pcm-dma.c or imx-pcm-fiq.c (whatever is
selected via Kconfig) will not be compiled, resulting in a
non-functional sound driver.

sound/soc/fsl/Makefile

index 515ba665f97c222714f5b138f1a8c03b95b74724..7bb5c38d43a1c9f9c6044918d51f0aa8595a1b9f 100644 (file)
@@ -36,8 +36,12 @@ obj-$(CONFIG_SND_SOC_IMX_AUDMUX) += snd-soc-imx-audmux.o
 
 obj-$(CONFIG_SND_SOC_IMX_PCM) += snd-soc-imx-pcm.o
 snd-soc-imx-pcm-y := imx-pcm.o
-snd-soc-imx-pcm-$(CONFIG_SND_SOC_IMX_PCM_FIQ) += imx-pcm-fiq.o
-snd-soc-imx-pcm-$(CONFIG_SND_SOC_IMX_PCM_DMA) += imx-pcm-dma.o
+ifneq ($(CONFIG_SND_SOC_IMX_PCM_FIQ),)
+       snd-soc-imx-pcm-objs += imx-pcm-fiq.o
+endif
+ifneq ($(CONFIG_SND_SOC_IMX_PCM_DMA),)
+       snd-soc-imx-pcm-objs += imx-pcm-dma.o
+endif
 
 # i.MX Machine Support
 snd-soc-eukrea-tlv320-objs := eukrea-tlv320.o