Merge branch 'next/devel2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux...

[pandora-kernel.git] / sound / soc / codecs / Kconfig

diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index 36a030f..379b2e3 100644 (file)
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -250,10 +250,11 @@ config SND_SOC_TLV320DAC33
        tristate
 
 config SND_SOC_TWL4030
-       select TWL4030_CODEC
+       select MFD_TWL4030_AUDIO
        tristate
 
 config SND_SOC_TWL6040
+       select TWL6040_CORE
        tristate
 
 config SND_SOC_UDA134X