Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/configh

[karo-tx-linux.git] / drivers / mmc / Makefile

diff --git a/drivers/mmc/Makefile b/drivers/mmc/Makefile
index 5d2b9ab59c41c6ec6d6beb3d90627c61d0ad02bf..acfd4de0aba526f5bc220ef33c0c50643bcbc896 100644 (file)
--- a/drivers/mmc/Makefile
+++ b/drivers/mmc/Makefile
@@ -17,13 +17,16 @@ obj-$(CONFIG_MMC_BLOCK)             += mmc_block.o
 #
 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_AT91RM9200)   += at91_mci.o
+obj-$(CONFIG_MMC_TIFM_SD)      += tifm_sd.o
 
-mmc_core-y := mmc.o mmc_queue.o mmc_sysfs.o
+mmc_core-y := mmc.o mmc_sysfs.o
+mmc_core-$(CONFIG_BLOCK) += mmc_queue.o
 
 ifeq ($(CONFIG_MMC_DEBUG),y)
 EXTRA_CFLAGS += -DDEBUG