aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.6/066-snd-soc-dmaengine-pcm.patch
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2012-12-11 20:14:39 +0000
committerGabor Juhos <juhosg@openwrt.org>2012-12-11 20:14:39 +0000
commit2c0ebd76cfb548308807622ed4865f18d1808559 (patch)
treef36bbefa029c0849b8af1441dfa5b143128c3078 /target/linux/generic/patches-3.6/066-snd-soc-dmaengine-pcm.patch
parent64dc67c44a237d8d036e3488e4ff7ecf1a0d04e4 (diff)
downloadupstream-2c0ebd76cfb548308807622ed4865f18d1808559.tar.gz
upstream-2c0ebd76cfb548308807622ed4865f18d1808559.tar.bz2
upstream-2c0ebd76cfb548308807622ed4865f18d1808559.zip
kernel: update linux 3.6 to 3.6.10
Signed-off-by: Gabor Juhos <juhosg@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34639 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.patch7
1 files changed, 1 insertions, 6 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
index f29721815c..3afff7138f 100644
--- 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
@@ -13,13 +13,11 @@ 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-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
@@ -29,6 +27,3 @@ index bcbf1d0..99f32f7 100644
obj-$(CONFIG_SND_SOC) += snd-soc-core.o
obj-$(CONFIG_SND_SOC) += codecs/
---
-1.7.10.4
-