Merge branch 'ixp4xx' into devel

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

diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig
index ea41852ec8cd33f945eb942519fe90b680de7920..12af9c718764e36fcbad74fa37c01aa9d37544c4 100644 (file)
--- a/drivers/mmc/Kconfig
+++ b/drivers/mmc/Kconfig
@@ -40,7 +40,7 @@ config MMC_ARMMMCI
          If unsure, say N.
 
 config MMC_PXA
-       tristate "Intel PXA255 Multimedia Card Interface support"
+       tristate "Intel PXA25x/26x/27x Multimedia Card Interface support"
        depends on ARCH_PXA && MMC
        help
          This selects the Intel(R) PXA(R) Multimedia card Interface.
@@ -91,11 +91,11 @@ config MMC_AU1X
 
          If unsure, say N.
 
-config MMC_AT91RM9200
-       tristate "AT91RM9200 SD/MMC Card Interface support"
-       depends on ARCH_AT91RM9200 && MMC
+config MMC_AT91
+       tristate "AT91 SD/MMC Card Interface support"
+       depends on ARCH_AT91 && MMC
        help
-         This selects the AT91RM9200 MCI controller.
+         This selects the AT91 MCI controller.
 
          If unsure, say N.
 
@@ -111,7 +111,7 @@ config MMC_IMX
 
 config MMC_TIFM_SD
        tristate "TI Flash Media MMC/SD Interface support  (EXPERIMENTAL)"
-       depends on MMC && EXPERIMENTAL
+       depends on MMC && EXPERIMENTAL && PCI
        select TIFM_CORE
        help
          Say Y here if you want to be able to access MMC/SD cards with