Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / sound / soc / Makefile

diff --git a/sound/soc/Makefile b/sound/soc/Makefile
index e489dbdde45839664cbf44dd408143afce2374e2..782db2127108fd26c19a0bb6bf2ee378cbd4d0ac 100644 (file)
--- a/sound/soc/Makefile
+++ b/sound/soc/Makefile
@@ -1,4 +1,4 @@
 snd-soc-core-objs := soc-core.o soc-dapm.o
 
 obj-$(CONFIG_SND_SOC)  += snd-soc-core.o
-obj-$(CONFIG_SND_SOC)  += codecs/ at91/ pxa/ s3c24xx/ sh/ fsl/ davinci/
+obj-$(CONFIG_SND_SOC)  += codecs/ at91/ pxa/ s3c24xx/ sh/ fsl/ davinci/ omap/