Merge branch 'for-2.6.34' into for-2.6.35

[karo-tx-linux.git] / sound / soc / imx / Kconfig

diff --git a/sound/soc/imx/Kconfig b/sound/soc/imx/Kconfig
index 7174b4c710de4451f974214558af0dc27516457d..eba9b9d257a109b3e4554581cc97f9d6fe839035 100644 (file)
--- a/sound/soc/imx/Kconfig
+++ b/sound/soc/imx/Kconfig
@@ -11,3 +11,11 @@ config SND_IMX_SOC
 config SND_MXC_SOC_SSI
        tristate
 
+config SND_MXC_SOC_WM1133_EV1
+       tristate "Audio on the the i.MX31ADS with WM1133-EV1 fitted"
+       depends on SND_IMX_SOC && EXPERIMENTAL
+       select SND_SOC_WM8350
+       select SND_MXC_SOC_SSI
+       help
+         Enable support for audio on the i.MX31ADS with the WM1133-EV1
+         PMIC board with WM8835x fitted.