diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-09 14:58:11 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-09 14:58:11 +0100 |
| commit | 249d51b53aea1b7cdb1be65a1a9a0c59d9e06f3e (patch) | |
| tree | 7fc06930e46ee13d394f5b031166c40206af3189 /drivers/mmc/host/Makefile | |
| parent | 44581a28e805a31661469c4b466b9cd14b36e7b6 (diff) | |
| parent | 8e4921515c1a379539607eb443d51c30f4f7f338 (diff) | |
Merge commit 'v2.6.29-rc4' into core/percpu
Conflicts:
arch/x86/mach-voyager/voyager_smp.c
arch/x86/mm/fault.c
Diffstat (limited to 'drivers/mmc/host/Makefile')
| -rw-r--r-- | drivers/mmc/host/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/mmc/host/Makefile b/drivers/mmc/host/Makefile index 98cab84829b..dedec55861d 100644 --- a/drivers/mmc/host/Makefile +++ b/drivers/mmc/host/Makefile @@ -9,6 +9,7 @@ endif 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_SDHCI) += sdhci.o obj-$(CONFIG_MMC_SDHCI_PCI) += sdhci-pci.o obj-$(CONFIG_MMC_RICOH_MMC) += ricoh_mmc.o |