Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / drivers / mmc / host / Kconfig

diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
index 76eebaa69b9294a200617e42a1b2078d4712e119..bf90350d49875da2fb07c1e0aea703922d0419a6 100644 (file)
--- a/drivers/mmc/host/Kconfig
+++ b/drivers/mmc/host/Kconfig
@@ -186,3 +186,9 @@ config MMC_SDRICOH_CS
          To compile this driver as a module, choose M here: the
          module will be called sdricoh_cs.
 
+config MMC_TMIO
+       tristate "Toshiba Mobile IO Controller (TMIO) MMC/SD function support"
+       depends on MFD_TMIO
+       help
+         This provides support for the SD/MMC cell found in TC6393XB,
+         T7L66XB and also ipaq ASIC3