diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-05-20 08:05:42 (GMT) |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-05-20 08:05:42 (GMT) |
| commit | 05d134b084590684bcf4d832c0035952727b7cd9 (patch) | |
| tree | 8f5d5fd811634fa621792cad7ca361251c06cd88 /drivers/mmc | |
| parent | 6130c14605de760bdcaef36b8a0d34eac2a955f0 (diff) | |
| parent | d7782d06534fe4fa47a49fa7c106de5ba85a9687 (diff) | |
| download | u-boot-05d134b084590684bcf4d832c0035952727b7cd9.tar.xz | |
Merge remote-tracking branch 'u-boot/master'
Conflicts:
boards.cfg
Conflicts were trivial once u-boot-arm/master boards.cfg was
reformatted (commit 6130c146) to match u-boot/master's own
reformatting (commit 1b37fa83).
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/fsl_esdhc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/fsl_esdhc.c b/drivers/mmc/fsl_esdhc.c index 4c3b93d..50cba64 100644 --- a/drivers/mmc/fsl_esdhc.c +++ b/drivers/mmc/fsl_esdhc.c @@ -96,7 +96,7 @@ static uint esdhc_xfertyp(struct mmc_cmd *cmd, struct mmc_data *data) else if (cmd->resp_type & MMC_RSP_PRESENT) xfertyp |= XFERTYP_RSPTYP_48; -#if defined(CONFIG_MX53) || defined(CONFIG_T4240QDS) +#if defined(CONFIG_MX53) || defined(CONFIG_PPC_T4240) if (cmd->cmdidx == MMC_CMD_STOP_TRANSMISSION) xfertyp |= XFERTYP_CMDTYP_ABORT; #endif |