Merge branch 'wm8974-upstream' into for-2.6.32

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

diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index 910b9162cbbb7242780d90c0644e3fb2287f0131..167a5ce06cdf26d4393cd0225afcc9b2ef515c7e 100644 (file)
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -46,6 +46,7 @@ config SND_SOC_ALL_CODECS
        select SND_SOC_WM8960 if I2C
        select SND_SOC_WM8961 if I2C
        select SND_SOC_WM8971 if I2C
+       select SND_SOC_WM8974 if I2C
        select SND_SOC_WM8988 if SND_SOC_I2C_AND_SPI
        select SND_SOC_WM8990 if I2C
        select SND_SOC_WM8993 if I2C
@@ -188,6 +189,9 @@ config SND_SOC_WM8961
 config SND_SOC_WM8971
        tristate
 
+config SND_SOC_WM8974
+       tristate
+
 config SND_SOC_WM8988
        tristate