Merge branch 'for-2.6.31' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6

[pandora-kernel.git] / drivers / mmc / host / Kconfig

diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
index b4cf691..891ef18 100644 (file)
--- a/drivers/mmc/host/Kconfig
+++ b/drivers/mmc/host/Kconfig
@@ -83,6 +83,42 @@ config MMC_SDHCI_OF
 
          If unsure, say N.
 
+config MMC_SDHCI_PLTFM
+       tristate "SDHCI support on the platform specific bus"
+       depends on MMC_SDHCI
+       help
+         This selects the platform specific bus support for Secure Digital Host
+         Controller Interface.
+
+         If you have a controller with this interface, say Y or M here.
+
+         If unsure, say N.
+
+config MMC_SDHCI_S3C
+       tristate "SDHCI support on Samsung S3C SoC"
+       depends on MMC_SDHCI && (PLAT_S3C24XX || PLAT_S3C64XX)
+       help
+         This selects the Secure Digital Host Controller Interface (SDHCI)
+         often referrered to as the HSMMC block in some of the Samsung S3C
+         range of SoC.
+
+         Note, due to the problems with DMA, the DMA support is only
+         available with CONFIG_EXPERIMENTAL is selected.
+
+         If you have a controller with this interface, say Y or M here.
+
+         If unsure, say N.
+
+config MMC_SDHCI_S3C_DMA
+       bool "DMA support on S3C SDHCI"
+       depends on MMC_SDHCI_S3C && EXPERIMENTAL
+       help
+         Enable DMA support on the Samsung S3C SDHCI glue. The DMA
+         has proved to be problematic if the controller encounters
+         certain errors, and thus should be treated with care.
+
+         YMMV.
+
 config MMC_OMAP
        tristate "TI OMAP Multimedia Card Interface support"
        depends on ARCH_OMAP
@@ -155,7 +191,7 @@ config MMC_ATMELMCI_DMA
 
 config MMC_IMX
        tristate "Motorola i.MX Multimedia Card Interface support"
-       depends on ARCH_IMX
+       depends on ARCH_MX1
        help
          This selects the Motorola i.MX Multimedia card Interface.
          If you have a i.MX platform with a Multimedia Card slot,
@@ -237,7 +273,31 @@ config MMC_SDRICOH_CS
 
 config MMC_TMIO
        tristate "Toshiba Mobile IO Controller (TMIO) MMC/SD function support"
-       depends on MFD_TMIO
+       depends on MFD_TMIO || MFD_ASIC3
        help
          This provides support for the SD/MMC cell found in TC6393XB,
-         T7L66XB and also ipaq ASIC3
+         T7L66XB and also HTC ASIC3
+
+config MMC_CB710
+       tristate "ENE CB710 MMC/SD Interface support"
+       depends on PCI
+       select CB710_CORE
+       help
+         This option enables support for MMC/SD part of ENE CB710/720 Flash
+         memory card reader found in some laptops (ie. some versions of
+         HP Compaq nx9500).
+
+         This driver can also be built as a module. If so, the module
+         will be called cb710-mmc.
+
+config MMC_VIA_SDMMC
+       tristate "VIA SD/MMC Card Reader Driver"
+       depends on PCI
+       help
+         This selects the VIA SD/MMC Card Reader driver, say Y or M here.
+         VIA provides one multi-functional card reader which integrated into
+         some motherboards manufactured by VIA. This card reader supports
+         SD/MMC/SDHC.
+         If you have a controller with this interface, say Y or M here.
+
+         If unsure, say N.