Merge branch 'for-2.6.30' into for-2.6.31

[pandora-kernel.git] / sound / soc / Makefile

diff --git a/sound/soc/Makefile b/sound/soc/Makefile
index 0237879..8943a14 100644 (file)
--- a/sound/soc/Makefile
+++ b/sound/soc/Makefile
@@ -10,4 +10,5 @@ obj-$(CONFIG_SND_SOC) += fsl/
 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/