From c2e6720f27d8b28cde180f9f52fbffce28cf5568 Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Fri, 18 May 2012 13:01:19 +0200
Subject: [PATCH] --- yaml --- r: 308764 b: refs/heads/master c:
 1cb3642a68c983ada0f4090a4dac1d70a96126ca h: refs/heads/master v: v3

---
 [refs]                    |  2 +-
 trunk/drivers/mfd/Kconfig | 16 +++++++---------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index cee025792572..23a5f8ed3d34 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 65ee362cb2c13bd164ade0eda66919a2e16d8a89
+refs/heads/master: 1cb3642a68c983ada0f4090a4dac1d70a96126ca
diff --git a/trunk/drivers/mfd/Kconfig b/trunk/drivers/mfd/Kconfig
index b819eea1775a..094bf4eb4d86 100644
--- a/trunk/drivers/mfd/Kconfig
+++ b/trunk/drivers/mfd/Kconfig
@@ -623,7 +623,7 @@ config MFD_MC13783
 	tristate
 
 config MFD_MC13XXX
-	tristate "Support Freescale MC13783 and MC13892"
+	tristate
 	depends on SPI_MASTER || I2C
 	select MFD_CORE
 	select MFD_MC13783
@@ -633,24 +633,22 @@ config MFD_MC13XXX
 	  additional drivers must be enabled in order to use the
 	  functionality of the device.
 
-if MFD_MC13XXX
-
 config MFD_MC13XXX_SPI
-	tristate "MC13xxx SPI interface" if SPI_MASTER
-	default SPI_MASTER
+	tristate "Freescale MC13783 and MC13892 SPI interface"
+	depends on SPI_MASTER
 	select REGMAP_SPI
+	select MFD_MC13XXX
 	help
 	  Select this if your MC13xxx is connected via an SPI bus.
 
 config MFD_MC13XXX_I2C
-	tristate "MC13xxx I2C interface" if I2C
-	default I2C
+	tristate "Freescale MC13892 I2C interface"
+	depends on I2C
 	select REGMAP_I2C
+	select MFD_MC13XXX
 	help
 	  Select this if your MC13xxx is connected via an I2C bus.
 
-endif
-
 config ABX500_CORE
 	bool "ST-Ericsson ABX500 Mixed Signal Circuit register functions"
 	default y if ARCH_U300 || ARCH_U8500