1 files changed, 2 insertions, 104 deletions

diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig
index 12af9c718764..c7d64c0187fb 100644
--- a/drivers/mmc/Kconfig
+++ b/drivers/mmc/Kconfig
@@ -19,110 +19,8 @@ config MMC_DEBUG
           This is an option for use by developers; most people should
           say N here.  This enables MMC core and driver debugging.
 
-config MMC_BLOCK
-        tristate "MMC block device driver"
-        depends on MMC && BLOCK
-        default y
-        help
-          Say Y here to enable the MMC block device driver support.
-          This provides a block device driver, which you can use to
-          mount the filesystem. Almost everyone wishing MMC support
-          should say Y or M here.
-
-config MMC_ARMMMCI
-        tristate "ARM AMBA Multimedia Card Interface support"
-        depends on ARM_AMBA && MMC
-        help
-          This selects the ARM(R) AMBA(R) PrimeCell Multimedia Card
-          Interface (PL180 and PL181) support.  If you have an ARM(R)
-          platform with a Multimedia Card slot, say Y or M here.
-
-          If unsure, say N.
-
-config MMC_PXA
-        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.
-          If you have a PXA(R) platform with a Multimedia Card slot,
-          say Y or M here.
-
-          If unsure, say N.
-
-config MMC_SDHCI
-        tristate "Secure Digital Host Controller Interface support  (EXPERIMENTAL)"
-        depends on PCI && MMC && EXPERIMENTAL
-        help
-          This select the generic Secure Digital Host Controller Interface.
-          It is used by manufacturers such as Texas Instruments(R), Ricoh(R)
-          and Toshiba(R). Most controllers found in laptops are of this type.
-          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 && MMC
-        select TPS65010 if MACH_OMAP_H2
-        help
-          This selects the TI OMAP Multimedia card Interface.
-          If you have an OMAP board with a Multimedia Card slot,
-          say Y or M here.
-
-          If unsure, say N.
-
-config MMC_WBSD
-        tristate "Winbond W83L51xD SD/MMC Card Interface support"
-        depends on MMC && ISA_DMA_API
-        help
-          This selects the Winbond(R) W83L51xD Secure digital and
-          Multimedia card Interface.
-          If you have a machine with a integrated W83L518D or W83L519D
-          SD/MMC card reader, say Y or M here.
-
-          If unsure, say N.
-
-config MMC_AU1X
-        tristate "Alchemy AU1XX0 MMC Card Interface support"
-        depends on MMC && SOC_AU1200
-        help
-          This selects the AMD Alchemy(R) Multimedia card interface.
-          If you have a Alchemy platform with a MMC slot, say Y or M here.
-
-          If unsure, say N.
-
-config MMC_AT91
-        tristate "AT91 SD/MMC Card Interface support"
-        depends on ARCH_AT91 && MMC
-        help
-          This selects the AT91 MCI controller.
-
-          If unsure, say N.
-
-config MMC_IMX
-        tristate "Motorola i.MX Multimedia Card Interface support"
-        depends on ARCH_IMX && MMC
-        help
-          This selects the Motorola i.MX Multimedia card Interface.
-          If you have a i.MX platform with a Multimedia Card slot,
-          say Y or M here.
-
-          If unsure, say N.
-
-config MMC_TIFM_SD
-        tristate "TI Flash Media MMC/SD Interface support  (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
-          the Texas Instruments(R) Flash Media card reader, found in many
-          laptops.
-          This option 'selects' (turns on, enables) 'TIFM_CORE', but you
-          probably also need appropriate card reader host adapter, such as
-          'Misc devices: TI Flash Media PCI74xx/PCI76xx host adapter support
-          (TIFM_7XX1)'.
+source "drivers/mmc/card/Kconfig"
 
-          To compile this driver as a module, choose M here: the
-          module will be called tifm_sd.
+source "drivers/mmc/host/Kconfig"
 
 endmenu