diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-08-10 22:49:09 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-08-10 22:49:09 +0200 |
| commit | b77f380115028ef4b6cc59fc5ba332a6e31b4326 (patch) | |
| tree | 5e820aba8316467868b090bb841c79e1a7edf4cd /arch/arm | |
| parent | 4cfa0ab2c945f95e978a995721f193dd056e538d (diff) | |
| parent | 51b5870bdc837359299d22e8af48f315bd65d5fd (diff) | |
| download | blackbird-obmc-uboot-b77f380115028ef4b6cc59fc5ba332a6e31b4326.tar.gz blackbird-obmc-uboot-b77f380115028ef4b6cc59fc5ba332a6e31b4326.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-imx
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/cpu/armv7/mx51/timer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/cpu/armv7/mx51/timer.c b/arch/arm/cpu/armv7/mx51/timer.c index 81c4a06143..110edbfa85 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) |
