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]
/
lib_sh
/
time_sh2.c
diff --git
a/lib_sh/time_sh2.c
b/lib_sh/time_sh2.c
index
5c6c9d4
..
789b46f
100644
(file)
--- a/
lib_sh/time_sh2.c
+++ b/
lib_sh/time_sh2.c
@@
-103,7
+103,7
@@
void reset_timer(void)
cmt_timer_start(0);
}
-void udelay(unsigned long usec)
+void
__
udelay(unsigned long usec)
{
unsigned long end = get_usec() + usec;