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 'next' of ../next
[platform/kernel/u-boot.git]
/
cpu
/
arm920t
/
ks8695
/
timer.c
diff --git
a/cpu/arm920t/ks8695/timer.c
b/cpu/arm920t/ks8695/timer.c
index
22987bc
..
886e370
100644
(file)
--- a/
cpu/arm920t/ks8695/timer.c
+++ b/
cpu/arm920t/ks8695/timer.c
@@
-81,7
+81,7
@@
void set_timer(ulong t)
timer_ticks = t;
}
-void udelay(ulong usec)
+void
__
udelay(ulong usec)
{
ulong start = get_timer_masked();
ulong end;