diff --git a/[refs] b/[refs]
index 2361f4986a6e..f2ce9b3d3fc5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 168755ebb11e8bc17f2c12c42534adaf003a7d7e
+refs/heads/master: eee0e4b44f855f4a34c77137cb64d08c9fb484e9
diff --git a/trunk/drivers/mfd/Kconfig b/trunk/drivers/mfd/Kconfig
index b914483cd630..af46ce019fc7 100644
--- a/trunk/drivers/mfd/Kconfig
+++ b/trunk/drivers/mfd/Kconfig
@@ -465,7 +465,7 @@ config MFD_S5M_CORE
 	 of the device
 
 config MFD_WM8400
-	tristate "Support Wolfson Microelectronics WM8400"
+	bool "Support Wolfson Microelectronics WM8400"
 	select MFD_CORE
 	depends on I2C
 	select REGMAP_I2C