1 files changed, 7 insertions, 23 deletions

diff --git a/drivers/mmc/Makefile b/drivers/mmc/Makefile
index 9ef010a51608..4d2bdfeb8d76 100644
--- a/drivers/mmc/Makefile
+++ b/drivers/mmc/Makefile
@@ -2,32 +2,16 @@
 # Makefile for the kernel mmc device drivers.
 #
 
+ifeq ($(CONFIG_MMC_DEBUG),y)
+        EXTRA_CFLAGS            += -DDEBUG
+endif
+
 #
 # Core
 #
 obj-$(CONFIG_MMC)               += mmc_core.o
+mmc_core-y                      := mmc.o mmc_sysfs.o
 
-#
-# Media drivers
-#
-obj-$(CONFIG_MMC_BLOCK)         += mmc_block.o
-mmc_block-objs                  := block.o queue.o
+obj-$(CONFIG_MMC)               += card/
+obj-$(CONFIG_MMC)               += host/
 
-#
-# Host drivers
-#
-obj-$(CONFIG_MMC_ARMMMCI)       += mmci.o
-obj-$(CONFIG_MMC_PXA)           += pxamci.o
-obj-$(CONFIG_MMC_IMX)           += imxmmc.o
-obj-$(CONFIG_MMC_SDHCI)         += sdhci.o
-obj-$(CONFIG_MMC_WBSD)          += wbsd.o
-obj-$(CONFIG_MMC_AU1X)          += au1xmmc.o
-obj-$(CONFIG_MMC_OMAP)          += omap.o
-obj-$(CONFIG_MMC_AT91)          += at91_mci.o
-obj-$(CONFIG_MMC_TIFM_SD)       += tifm_sd.o
-
-mmc_core-y := mmc.o mmc_sysfs.o
-
-ifeq ($(CONFIG_MMC_DEBUG),y)
-EXTRA_CFLAGS += -DDEBUG
-endif