projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-2.6.27' of git://git.marvell.com/mv643xx_eth into upstream-fixes
[firefly-linux-kernel-4.4.55.git]
/
include
/
asm-cris
/
timex.h
diff --git
a/include/asm-cris/timex.h
b/include/asm-cris/timex.h
index 3fb069a3771761314edc9de8d1a08ffe9f55d367..b92e0e80fe86fdfcd2cbe2f42b8036d9492e63c2 100644
(file)
--- a/
include/asm-cris/timex.h
+++ b/
include/asm-cris/timex.h
@@
-16,7
+16,7
@@
typedef unsigned long long cycles_t;
-
extern
inline cycles_t get_cycles(void)
+
static
inline cycles_t get_cycles(void)
{
return 0;
}