Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

[safe/jmp/linux-2.6] / sound / soc / Makefile

diff --git a/sound/soc/Makefile b/sound/soc/Makefile
index 8943a14..6f1e28d 100644 (file)
--- a/sound/soc/Makefile
+++ b/sound/soc/Makefile
@@ -12,3 +12,4 @@ obj-$(CONFIG_SND_SOC) += pxa/
 obj-$(CONFIG_SND_SOC)  += s3c24xx/
 obj-$(CONFIG_SND_SOC)  += s6000/
 obj-$(CONFIG_SND_SOC)  += sh/
+obj-$(CONFIG_SND_SOC)  += txx9/