summaryrefslogtreecommitdiff
path: root/sound/soc/Makefile
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2009-08-15 14:20:44 +0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2009-08-15 14:20:44 +0400
commit08229de4b42816079ed5d15f0689fcd0af946d5e (patch)
tree7126dc7b220fbbce745cb5d9a8864e9690587da4 /sound/soc/Makefile
parentfbb474dedab871c7382858c374acd287dad4ab38 (diff)
parent2a708137fd7d3e0928f27157aaed8aba404b11c9 (diff)
downloadlinux-08229de4b42816079ed5d15f0689fcd0af946d5e.tar.xz
Merge branch 'for-2.6.32' into mxc
Conflicts: sound/soc/Makefile
Diffstat (limited to 'sound/soc/Makefile')
-rw-r--r--sound/soc/Makefile6
1 files changed, 4 insertions, 2 deletions
diff --git a/sound/soc/Makefile b/sound/soc/Makefile
index 8120b52a4686..0c5eac01bf2e 100644
--- a/sound/soc/Makefile
+++ b/sound/soc/Makefile
@@ -1,4 +1,4 @@
-snd-soc-core-objs := soc-core.o soc-dapm.o soc-jack.o
+snd-soc-core-objs := soc-core.o soc-dapm.o soc-jack.o soc-cache.o
obj-$(CONFIG_SND_SOC) += snd-soc-core.o
obj-$(CONFIG_SND_SOC) += codecs/
@@ -7,8 +7,10 @@ obj-$(CONFIG_SND_SOC) += au1x/
obj-$(CONFIG_SND_SOC) += blackfin/
obj-$(CONFIG_SND_SOC) += davinci/
obj-$(CONFIG_SND_SOC) += fsl/
+obj-$(CONFIG_SND_SOC) += imx/
obj-$(CONFIG_SND_SOC) += omap/
obj-$(CONFIG_SND_SOC) += pxa/
obj-$(CONFIG_SND_SOC) += s3c24xx/
+obj-$(CONFIG_SND_SOC) += s6000/
obj-$(CONFIG_SND_SOC) += sh/
-obj-$(CONFIG_SND_SOC) += imx/
+obj-$(CONFIG_SND_SOC) += txx9/