diff options
author | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-12-18 14:41:16 +0000 |
---|---|---|
committer | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-12-18 14:41:16 +0000 |
commit | 56bc2d9958b929d934910e2c752b1a78cb46dd4c (patch) | |
tree | 423d304c978d10050f7961db178868f4cbd46218 /target/linux/generic/patches-3.6/066-snd-soc-dmaengine-pcm.patch | |
parent | 335bb39d959093ba93f117b0962b671f1136541d (diff) |
kernel: update linux 3.6 to 3.6.11
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34748 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.6/066-snd-soc-dmaengine-pcm.patch')
-rw-r--r-- | target/linux/generic/patches-3.6/066-snd-soc-dmaengine-pcm.patch | 29 |
1 files changed, 0 insertions, 29 deletions
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 deleted file mode 100644 index 3afff7138..000000000 --- a/target/linux/generic/patches-3.6/066-snd-soc-dmaengine-pcm.patch +++ /dev/null @@ -1,29 +0,0 @@ -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(-) - ---- 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/ |