From 5c28c5255f9199b3c1e1078621d569b365c17002 Mon Sep 17 00:00:00 2001 From: Florian Fainelli <florian@openwrt.org> Date: Mon, 10 Dec 2012 21:05:27 +0000 Subject: [PATCH] generic: backport an upstream fix for building snd-soc-pcm as a module Signed-off-by: Florian Fainelli <florian@openwrt.org> SVN-Revision: 34617 --- .../066-snd-soc-dmaengine-pcm.patch | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 target/linux/generic/patches-3.6/066-snd-soc-dmaengine-pcm.patch diff --git a/target/linux/generic/patches-3.6/066-snd-soc-dmaengine-pcm.patch b/target/linux/generic/patches-3.6/066-snd-soc-dmaengine-pcm.patch new file mode 100644 index 0000000000..f29721815c --- /dev/null +++ b/target/linux/generic/patches-3.6/066-snd-soc-dmaengine-pcm.patch @@ -0,0 +1,34 @@ +From 961a7aeafab477f63d9eef26afde9cbb8badcd0f Mon Sep 17 00:00:00 2001 +From: Peter Ujfalusi <peter.ujfalusi@ti.com> +Date: Mon, 1 Oct 2012 12:29:26 +0300 +Subject: [PATCH] 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> +--- + sound/soc/Makefile | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/sound/soc/Makefile b/sound/soc/Makefile +index bcbf1d0..99f32f7 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/ +-- +1.7.10.4 + -- 2.34.1