summaryrefslogtreecommitdiffstats
path: root/include/asm-cris/timex.h
diff options
context:
space:
mode:
authorMikael Starvik <mikael.starvik@axis.com>2005-07-27 11:44:43 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-07-27 16:26:01 -0700
commit5d01e6ce785884a5db5792cd2e5bb36fa82fe23c (patch)
treeaec09f0c058a6750904b947733a6cc7033359447 /include/asm-cris/timex.h
parentdcf1310b72149d016970c666539d4d73bb77c086 (diff)
downloadblackbird-op-linux-5d01e6ce785884a5db5792cd2e5bb36fa82fe23c.tar.gz
blackbird-op-linux-5d01e6ce785884a5db5792cd2e5bb36fa82fe23c.zip
[PATCH] CRIS update: updates for 2.6.12
Patches to make CRIS work with 2.6.12. Signed-off-by: Mikael Starvik <starvik@axis.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
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 375c41af47de..3fb069a37717 100644
--- a/include/asm-cris/timex.h
+++ b/include/asm-cris/timex.h
@@ -14,7 +14,7 @@
* used so it does not matter.
*/
-typedef unsigned int cycles_t;
+typedef unsigned long long cycles_t;
extern inline cycles_t get_cycles(void)
{
OpenPOWER on IntegriCloud