Merge current mainline tree into linux-omap tree

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

diff --git a/drivers/mmc/host/Makefile b/drivers/mmc/host/Makefile
index ba477bc0f1b40bbd15daf40584964c3b85dda1e8..98cab84829b89ef73e388dcaffaabcd9e37f9b25 100644 (file)
--- a/drivers/mmc/host/Makefile
+++ b/drivers/mmc/host/Makefile
@@ -20,6 +20,9 @@ obj-$(CONFIG_MMC_AT91)                += at91_mci.o
 obj-$(CONFIG_MMC_ATMELMCI)     += atmel-mci.o
 obj-$(CONFIG_MMC_TIFM_SD)      += tifm_sd.o
 obj-$(CONFIG_MMC_SPI)          += mmc_spi.o
+ifeq ($(CONFIG_OF),y)
+obj-$(CONFIG_MMC_SPI)          += of_mmc_spi.o
+endif
 obj-$(CONFIG_MMC_S3C)          += s3cmci.o
 obj-$(CONFIG_MMC_SDRICOH_CS)   += sdricoh_cs.o
 obj-$(CONFIG_MMC_TMIO)         += tmio_mmc.o