diff --git a/[refs] b/[refs]
index 55aec0628fb2..7f00215a257d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c6a5d9ff6f96128161126c0a01f0a28edf8010da
+refs/heads/master: 49003a68926e073fc71062d210c6f9febc8665a2
diff --git a/trunk/drivers/mfd/Kconfig b/trunk/drivers/mfd/Kconfig
index 53cbd16c7a4a..5c043693f52c 100644
--- a/trunk/drivers/mfd/Kconfig
+++ b/trunk/drivers/mfd/Kconfig
@@ -497,7 +497,7 @@ config MFD_S5M_CORE
 
 config MFD_ARIZONA
 	select REGMAP
-	tristate
+	bool
 
 config MFD_ARIZONA_I2C
 	tristate "Support Wolfson Microelectronics Arizona platform with I2C"