Merge master.kernel.org:/home/rmk/linux-2.6-arm

[~andy/linux] / sound / soc / Makefile

diff --git a/sound/soc/Makefile b/sound/soc/Makefile
index b211ee63fd760bb5d637ad460fc669611a7f644d..0ae2e49036f9050bffa9701129cb1bd4f69665d6 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/