Merge tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux-2.6

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

diff --git a/sound/soc/samsung/Kconfig b/sound/soc/samsung/Kconfig
index 7aaaf8e8056f7b8acd912fec109089a1b3c940ee..f3417f2311b819bd4a3eb5590b26c338c162de05 100644 (file)
--- a/sound/soc/samsung/Kconfig
+++ b/sound/soc/samsung/Kconfig
@@ -193,8 +193,8 @@ config SND_SOC_SPEYSIDE
        select SND_SOC_WM9081
        select SND_SOC_WM1250_EV1
 
-config SND_SOC_SPEYSIDE_WM8962
-       tristate "Audio support for Wolfson Speyside with WM8962"
+config SND_SOC_TOBERMORY
+       tristate "Audio support for Wolfson Tobermory"
        depends on SND_SOC_SAMSUNG && MACH_WLF_CRAGG_6410
        select SND_SAMSUNG_I2S
        select SND_SOC_WM8962
@@ -210,4 +210,5 @@ config SND_SOC_LITTLEMILL
        tristate "Audio support for Wolfson Littlemill"
        depends on SND_SOC_SAMSUNG && MACH_WLF_CRAGG_6410
        select SND_SAMSUNG_I2S
+       select MFD_WM8994
        select SND_SOC_WM8994