diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-08-10 20:49:09 (GMT) |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-08-10 20:49:09 (GMT) |
| commit | b77f380115028ef4b6cc59fc5ba332a6e31b4326 (patch) | |
| tree | 5e820aba8316467868b090bb841c79e1a7edf4cd | |
| parent | 4cfa0ab2c945f95e978a995721f193dd056e538d (diff) | |
| parent | 51b5870bdc837359299d22e8af48f315bd65d5fd (diff) | |
| download | u-boot-b77f380115028ef4b6cc59fc5ba332a6e31b4326.tar.xz | |
Merge branch 'master' of git://git.denx.de/u-boot-imx
| -rw-r--r-- | arch/arm/cpu/armv7/mx51/timer.c | 2 | ||||
| -rw-r--r-- | common/cmd_mmc.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/cpu/armv7/mx51/timer.c b/arch/arm/cpu/armv7/mx51/timer.c index 81c4a06..110edbf 100644 --- a/arch/arm/cpu/armv7/mx51/timer.c +++ b/arch/arm/cpu/armv7/mx51/timer.c @@ -89,7 +89,7 @@ ulong get_timer_masked(void) timestamp += ((0xFFFFFFFF / (CONFIG_MX51_CLK32 / CONFIG_SYS_HZ)) - lastinc) + val; lastinc = val; - return val; + return timestamp; } ulong get_timer(ulong base) diff --git a/common/cmd_mmc.c b/common/cmd_mmc.c index a6ed6a8..c0b30d8 100644 --- a/common/cmd_mmc.c +++ b/common/cmd_mmc.c @@ -133,7 +133,7 @@ int do_mmcinfo (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) U_BOOT_CMD( mmcinfo, 2, 0, do_mmcinfo, "display MMC info", - "<dev num>\n + "<dev num>\n" " - device number of the device to dislay info of\n" "" ); |