Merge commit 'origin/master' into next

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

diff --git a/sound/soc/Kconfig b/sound/soc/Kconfig
index 3304f9dd92fa2d7f6ffefafee0431734d428603b..d3e786a9a0a7ec08a69564700910ef49ac4f4927 100644 (file)
--- a/sound/soc/Kconfig
+++ b/sound/soc/Kconfig
@@ -34,6 +34,7 @@ source "sound/soc/pxa/Kconfig"
 source "sound/soc/s3c24xx/Kconfig"
 source "sound/soc/s6000/Kconfig"
 source "sound/soc/sh/Kconfig"
+source "sound/soc/txx9/Kconfig"
 
 # Supported codecs
 source "sound/soc/codecs/Kconfig"