diff options
| author | Wolfgang Denk <wd@denx.de> | 2012-05-20 19:20:50 (GMT) |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2012-05-20 19:20:50 (GMT) |
| commit | 6bc337fb13003a9a949dfb2713e308fb97faae8a (patch) | |
| tree | 3ce9b22609e6c1d3e140fd2fb96af0c26efa948d /drivers/mmc/Makefile | |
| parent | f50bf50d7f6f99c5ad4666d63a7eef43d3940500 (diff) | |
| parent | 7d2d58b4e63a8307f713e6b17fdb9b2413548574 (diff) | |
| download | u-boot-6bc337fb13003a9a949dfb2713e308fb97faae8a.tar.xz | |
Merge branch 'master' of git://git.denx.de/u-boot-mmc
* 'master' of git://git.denx.de/u-boot-mmc:
ARM: SAMSUNG: support sdhci controller
mmc: support the sdhci instead of s5p_mmc for samsung-soc
mmc: add the quirk to use the sdhci for samsung-soc
mmc: sdhci: add the quirk for broken r1b response
i.MX28: Lower the amount of blocks transfered in one DMA cycle
mmc: fsl_esdhc: Poll until card is not busy anymore
include/mmc.h: remove struct mmc_csd
mmc: omap: handle controller errors properly
mmc: omap: improve stat wait message
mmc: omap: follow TRM procedure to power on cards
mmc:fix: Set mmc width according to MMC host capabilities
Diffstat (limited to 'drivers/mmc/Makefile')
| -rw-r--r-- | drivers/mmc/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/Makefile b/drivers/mmc/Makefile index c245352..a8e681c 100644 --- a/drivers/mmc/Makefile +++ b/drivers/mmc/Makefile @@ -39,8 +39,8 @@ COBJS-$(CONFIG_MXS_MMC) += mxsmmc.o COBJS-$(CONFIG_OMAP_HSMMC) += omap_hsmmc.o COBJS-$(CONFIG_PXA_MMC) += pxa_mmc.o COBJS-$(CONFIG_PXA_MMC_GENERIC) += pxa_mmc_gen.o -COBJS-$(CONFIG_S5P_MMC) += s5p_mmc.o COBJS-$(CONFIG_SDHCI) += sdhci.o +COBJS-$(CONFIG_S5P_SDHCI) += s5p_sdhci.o COBJS-$(CONFIG_SH_MMCIF) += sh_mmcif.o COBJS-$(CONFIG_TEGRA2_MMC) += tegra2_mmc.o |