summaryrefslogtreecommitdiffstats
path: root/drivers/mmc/host/Makefile
diff options
context:
space:
mode:
authorTomi Valkeinen <tomi.valkeinen@ti.com>2012-06-13 10:24:38 +0200
committerTomi Valkeinen <tomi.valkeinen@ti.com>2012-06-13 10:24:38 +0200
commit289733ed456f7c1cbdb1f1ca58312f77c239953b (patch)
tree99bed0a5c21d0bdc5f6c10bc80a1ae8dbbd56be6 /drivers/mmc/host/Makefile
parentOMAPDSS: fix registration of DPI and SDI devices (diff)
parentLinux 3.5-rc2 (diff)
downloadlinux-289733ed456f7c1cbdb1f1ca58312f77c239953b.tar.xz
linux-289733ed456f7c1cbdb1f1ca58312f77c239953b.zip
Merge tag 'v3.5-rc2'
Merge v3.5-rc2 to get latest device tree and dynamic debug changes.
Diffstat (limited to 'drivers/mmc/host/Makefile')
-rw-r--r--drivers/mmc/host/Makefile1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/mmc/host/Makefile b/drivers/mmc/host/Makefile
index 3e7e26d08073..8922b06be925 100644
--- a/drivers/mmc/host/Makefile
+++ b/drivers/mmc/host/Makefile
@@ -4,7 +4,6 @@
obj-$(CONFIG_MMC_ARMMMCI) += mmci.o
obj-$(CONFIG_MMC_PXA) += pxamci.o
-obj-$(CONFIG_MMC_IMX) += imxmmc.o
obj-$(CONFIG_MMC_MXC) += mxcmmc.o
obj-$(CONFIG_MMC_MXS) += mxs-mmc.o
obj-$(CONFIG_MMC_SDHCI) += sdhci.o