Merge branch 'omap-fixes'

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

diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
index e8a7b50a01e753808c28b67e94526f168e1fc920..5e7ef789c828735754e25275a60f54ac9c3d9a86 100644 (file)
--- a/drivers/mmc/host/Kconfig
+++ b/drivers/mmc/host/Kconfig
@@ -72,10 +72,22 @@ config MMC_RICOH_MMC
 
          If unsure, say Y.
 
+config MMC_SDHCI_OF
+       tristate "SDHCI support on OpenFirmware platforms"
+       depends on MMC_SDHCI && PPC_OF
+       select MMC_SDHCI_IO_ACCESSORS
+       help
+         This selects the OF support for Secure Digital Host Controller
+         Interfaces. So far, only the Freescale eSDHC controller is known
+         to exist on OF platforms.
+
+         If unsure, say N.
+
 config MMC_OMAP
        tristate "TI OMAP Multimedia Card Interface support"
-       depends on ARCH_OMAP
+       depends on ARCH_OMAP1 || (ARCH_OMAP2 && ARCH_OMAP2420)
        select TPS65010 if MACH_OMAP_H2
+       select OMAP_GPIO_SWITCH if MACH_NOKIA_N800
        help
          This selects the TI OMAP Multimedia card Interface.
          If you have an OMAP board with a Multimedia Card slot,
@@ -195,7 +207,7 @@ config MMC_SPI
        select CRC7
        select CRC_ITU_T
        help
-         Some systems accss MMC/SD/SDIO cards using a SPI controller
+         Some systems access MMC/SD/SDIO cards using a SPI controller
          instead of using a "native" MMC/SD/SDIO controller.  This has a
          disadvantage of being relatively high overhead, but a compensating
          advantage of working on many systems without dedicated MMC/SD/SDIO