summaryrefslogtreecommitdiff
path: root/include/asm-cris/timex.h
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2005-12-07 01:31:30 +0300
committerLen Brown <len.brown@intel.com>2005-12-07 01:31:30 +0300
commit3d5271f9883cba7b54762bc4fe027d4172f06db7 (patch)
treeab8a881a14478598a0c8bda0d26c62cdccfffd6d /include/asm-cris/timex.h
parent378b2556f4e09fa6f87ff0cb5c4395ff28257d02 (diff)
parent9115a6c787596e687df03010d97fccc5e0762506 (diff)
downloadlinux-3d5271f9883cba7b54762bc4fe027d4172f06db7.tar.xz
Pull release into acpica branch
Diffstat (limited to 'include/asm-cris/timex.h')
-rw-r--r--include/asm-cris/timex.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-cris/timex.h b/include/asm-cris/timex.h
index 3fb069a37717..b92e0e80fe86 100644
--- 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;
}