diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index 5beff5b7ef2ee6446f7d958b0c7edcf7969ab070..10c44d3fe01a429172855d2b76ea54e9255b6779 100644
--- a/drivers/mfd/Kconfig
+++ b/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/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
index 6fef078a2049139a0d2555bca5601c6f0f9553c3..ea8d7a3490d9b7ee575f23587721337ac8cbbc4a 100644
--- a/drivers/mmc/host/Kconfig
+++ b/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/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig
index fd6debb242523cfcffbd39a5767c7b6885128736..41f361c49b32b73344b62f0838eb35647328dceb 100644
--- a/drivers/mtd/nand/Kconfig
+++ b/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.