1 files changed, 17 insertions, 11 deletions

diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
index a5652548230a..451135822464 100644
--- a/drivers/mmc/host/Kconfig
+++ b/drivers/mmc/host/Kconfig
@@ -290,6 +290,18 @@ config MMC_MOXART
           be found on some embedded hardware such as UC-7112-LX.
           If you have a controller with this interface, say Y here.
 
+config MMC_SDHCI_ST
+        tristate "SDHCI support on STMicroelectronics SoC"
+        depends on ARCH_STI
+        depends on MMC_SDHCI_PLTFM
+        select MMC_SDHCI_IO_ACCESSORS
+        help
+          This selects the Secure Digital Host Controller Interface in
+          STMicroelectronics SoCs.
+
+          If you have a controller with this interface, say Y or M here.
+          If unsure, say N.
+
 config MMC_OMAP
         tristate "TI OMAP Multimedia Card Interface support"
         depends on ARCH_OMAP
@@ -303,6 +315,7 @@ config MMC_OMAP
 
 config MMC_OMAP_HS
         tristate "TI OMAP High Speed Multimedia Card Interface support"
+        depends on HAS_DMA
         depends on ARCH_OMAP2PLUS || COMPILE_TEST
         help
           This selects the TI OMAP High Speed Multimedia card Interface.
@@ -343,7 +356,7 @@ config MMC_ATMELMCI
 
 config MMC_SDHCI_MSM
         tristate "Qualcomm SDHCI Controller Support"
-        depends on ARCH_QCOM
+        depends on ARCH_QCOM || (ARM && COMPILE_TEST)
         depends on MMC_SDHCI_PLTFM
         help
           This selects the Secure Digital Host Controller Interface (SDHCI)
@@ -440,6 +453,7 @@ config MMC_SPI
 config MMC_S3C
         tristate "Samsung S3C SD/MMC Card Interface support"
         depends on ARCH_S3C24XX
+        depends on S3C24XX_DMAC
         help
           This selects a driver for the MCI interface found in
           Samsung's S3C2410, S3C2412, S3C2440, S3C2442 CPUs.
@@ -477,15 +491,6 @@ config MMC_S3C_DMA
           working properly and needs to be debugged before this
           option is useful.
 
-config MMC_S3C_PIODMA
-        bool "Support for both PIO and DMA"
-        help
-          Compile both the PIO and DMA transfer routines into the
-          driver and let the platform select at run-time which one
-          is best.
-
-          See notes for the DMA option.
-
 endchoice
 
 config MMC_SDRICOH_CS
@@ -623,7 +628,7 @@ config MMC_DW_PCI
 
 config MMC_SH_MMCIF
         tristate "SuperH Internal MMCIF support"
-        depends on MMC_BLOCK
+        depends on MMC_BLOCK && HAS_DMA
         depends on SUPERH || ARCH_SHMOBILE || COMPILE_TEST
         help
           This selects the MMC Host Interface controller (MMCIF).
@@ -697,6 +702,7 @@ config MMC_WMT
 
 config MMC_USDHI6ROL0
         tristate "Renesas USDHI6ROL0 SD/SDIO Host Controller support"
+        depends on HAS_DMA
         help
           This selects support for the Renesas USDHI6ROL0 SD/SDIO
           Host Controller