From a6ce1347de144b80eacc033f7144a5e9cadc48d9 Mon Sep 17 00:00:00 2001
From: Samuel Ortiz <sameo@openedhand.com>
Date: Tue, 5 Aug 2008 19:27:58 +0200
Subject: [PATCH] --- yaml --- r: 108158 b: refs/heads/master c:
 1c2c30acc52320d506d722f41d50e8eb8fda5cb5 h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/mfd/Kconfig      | 9 +++++++++
 trunk/drivers/mmc/host/Kconfig | 2 +-
 trunk/drivers/mtd/nand/Kconfig | 2 +-
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 15a85945f99e..2454d98d2564 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4a48998fa16121d0fe3436cce43afd6f47424103
+refs/heads/master: 1c2c30acc52320d506d722f41d50e8eb8fda5cb5
diff --git a/trunk/drivers/mfd/Kconfig b/trunk/drivers/mfd/Kconfig
index 5beff5b7ef2e..10c44d3fe01a 100644
--- a/trunk/drivers/mfd/Kconfig
+++ b/trunk/drivers/mfd/Kconfig
@@ -50,15 +50,23 @@ config HTC_PASIC3
 	  HTC Magician devices, respectively. Actual functionality is
 	  handled by the leds-pasic3 and ds1wm drivers.
 
+config MFD_TMIO
+	bool
+	default n
+
 config MFD_T7L66XB
 	bool "Support Toshiba T7L66XB"
+	depends on ARM
 	select MFD_CORE
+	select MFD_TMIO
 	help
 	  Support for Toshiba Mobile IO Controller T7L66XB
 
 config MFD_TC6387XB
 	bool "Support Toshiba TC6387XB"
+	depends on ARM
 	select MFD_CORE
+	select MFD_TMIO
 	help
 	  Support for Toshiba Mobile IO Controller TC6387XB
 
@@ -66,6 +74,7 @@ config MFD_TC6393XB
 	bool "Support Toshiba TC6393XB"
 	depends on GPIOLIB && ARM
 	select MFD_CORE
+	select MFD_TMIO
 	help
 	  Support for Toshiba Mobile IO Controller TC6393XB
 
diff --git a/trunk/drivers/mmc/host/Kconfig b/trunk/drivers/mmc/host/Kconfig
index 6fef078a2049..ea8d7a3490d9 100644
--- a/trunk/drivers/mmc/host/Kconfig
+++ b/trunk/drivers/mmc/host/Kconfig
@@ -176,7 +176,7 @@ config MMC_SDRICOH_CS
 
 config MMC_TMIO
 	tristate "Toshiba Mobile IO Controller (TMIO) MMC/SD function support"
-	depends on MFD_CORE
+	depends on MFD_TMIO
 	help
 	  This provides support for the SD/MMC cell found in TC6393XB,
 	  T7L66XB and also ipaq ASIC3
diff --git a/trunk/drivers/mtd/nand/Kconfig b/trunk/drivers/mtd/nand/Kconfig
index fd6debb24252..41f361c49b32 100644
--- a/trunk/drivers/mtd/nand/Kconfig
+++ b/trunk/drivers/mtd/nand/Kconfig
@@ -353,7 +353,7 @@ config MTD_NAND_PASEMI
 
 config MTD_NAND_TMIO
 	tristate "NAND Flash device on Toshiba Mobile IO Controller"
-	depends on MTD_NAND && MFD_CORE
+	depends on MTD_NAND && MFD_TMIO
 	help
 	  Support for NAND flash connected to a Toshiba Mobile IO
 	  Controller in some PDAs, including the Sharp SL6000x.