projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into upstream
[powerpc.git]
/
include
/
asm-cris
/
arch-v32
/
timex.h
diff --git
a/include/asm-cris/arch-v32/timex.h
b/include/asm-cris/arch-v32/timex.h
index
4d0fd23
..
5a4aa28
100644
(file)
--- a/
include/asm-cris/arch-v32/timex.h
+++ b/
include/asm-cris/arch-v32/timex.h
@@
-22,7
+22,7
@@
extern unsigned long get_ns_in_jiffie(void);
extern unsigned long get_ns_in_jiffie(void);
-
extern
inline unsigned long get_us_in_jiffie_highres(void)
+
static
inline unsigned long get_us_in_jiffie_highres(void)
{
return get_ns_in_jiffie() / 1000;
}
{
return get_ns_in_jiffie() / 1000;
}