diff --git a/[refs] b/[refs]
index e6237433ed90..36e9f707bad0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 518fb721de3685c8326e72746151b534a241feda
+refs/heads/master: aec519b5ec95e2d8b33b7620a2830afc55707e40
diff --git a/trunk/drivers/mfd/Kconfig b/trunk/drivers/mfd/Kconfig
index d67511a67fdd..05f882f5d278 100644
--- a/trunk/drivers/mfd/Kconfig
+++ b/trunk/drivers/mfd/Kconfig
@@ -720,8 +720,8 @@ config MFD_PM8XXX_IRQ
 	  and MPP.
 
 config MFD_TPS65910
-	tristate "TPS65910 Power Management chip"
-	depends on I2C &&  GPIOLIB
+	bool "TPS65910 Power Management chip"
+	depends on I2C && GPIOLIB
 	select MFD_CORE
 	help
 	  if you say yes here you get support for the TPS65910 series of