]> nv-tegra.nvidia Code Review - linux-2.6.git/blobdiff - sound/soc/Makefile
Merge branch 'for-2.6.32' into mxc
[linux-2.6.git] / sound / soc / Makefile
index 8120b52a46867e6a5f99ae53ad2ec6bbb7670017..0c5eac01bf2e5ffbc8d4691987c7097b90dce90a 100644 (file)
@@ -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/