Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/asoc...

[mv-sheeva.git] / sound / soc / codecs / Kconfig

diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index f6c6d316ac675c5148f8ec1a550e320dea11d6a1..883a312bb2931d3afaee63cbd8a2564c6a447393 100644 (file)
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -78,6 +78,7 @@ config SND_SOC_ALL_CODECS
        select SND_SOC_WM8990 if I2C
        select SND_SOC_WM8993 if I2C
        select SND_SOC_WM8994 if MFD_WM8994
+       select SND_SOC_WM8995 if SND_SOC_I2C_AND_SPI
        select SND_SOC_WM9081 if I2C
        select SND_SOC_WM9090 if I2C
        select SND_SOC_WM9705 if SND_SOC_AC97_BUS
@@ -309,6 +310,9 @@ config SND_SOC_WM8993
 config SND_SOC_WM8994
        tristate
 
+config SND_SOC_WM8995
+       tristate
+
 config SND_SOC_WM9081
        tristate