diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-02 13:32:55 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-02 13:32:55 -0700 |
| commit | ef7a4567dc542d8cc563755478464ea928fede41 (patch) | |
| tree | 6a9005cadbe8968adcf75204541d8fa6bbad5b2c /drivers/mmc/Makefile | |
| parent | a2308b7f0838406c346a2b0259ff88c7fcf41e79 (diff) | |
| parent | 56ca904053ab14ba4067a72b69a5edf246771209 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-mmc
* master.kernel.org:/home/rmk/linux-2.6-mmc:
[ARM] 3457/1: i.MX: SD/MMC support for i.MX/MX1
[ARM] 3456/1: AT91RM9200 support for 2.6 (MMC/SD driver)
Diffstat (limited to 'drivers/mmc/Makefile')
| -rw-r--r-- | drivers/mmc/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/mmc/Makefile b/drivers/mmc/Makefile index c7c34aadfc9..d2957e35cc6 100644 --- a/drivers/mmc/Makefile +++ b/drivers/mmc/Makefile @@ -17,10 +17,12 @@ 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 mmc_core-y := mmc.o mmc_queue.o mmc_sysfs.o |