projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.denx.de/u-boot-sh
[platform/kernel/u-boot.git]
/
arch
/
arm
/
cpu
/
arm926ejs
/
mx25
/
timer.c
diff --git
a/arch/arm/cpu/arm926ejs/mx25/timer.c
b/arch/arm/cpu/arm926ejs/mx25/timer.c
index
11d41a8
..
14f0c2d
100644
(file)
--- a/
arch/arm/cpu/arm926ejs/mx25/timer.c
+++ b/
arch/arm/cpu/arm926ejs/mx25/timer.c
@@
-41,8
+41,10
@@
#include <asm/io.h>
#include <asm/arch/imx-regs.h>
-static ulong timestamp;
-static ulong lastinc;
+DECLARE_GLOBAL_DATA_PTR;
+
+#define timestamp gd->tbl
+#define lastinc gd->lastinc
/*
* "time" is measured in 1 / CONFIG_SYS_HZ seconds,