diff options
| author | Mikael Starvik <mikael.starvik@axis.com> | 2005-07-27 14:44:43 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-27 19:26:01 -0400 |
| commit | 5d01e6ce785884a5db5792cd2e5bb36fa82fe23c (patch) | |
| tree | aec09f0c058a6750904b947733a6cc7033359447 /include/asm-cris/timex.h | |
| parent | dcf1310b72149d016970c666539d4d73bb77c086 (diff) | |
[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.h | 2 |
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 @@ | |||
| 14 | * used so it does not matter. | 14 | * used so it does not matter. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | typedef unsigned int cycles_t; | 17 | typedef unsigned long long cycles_t; |
| 18 | 18 | ||
| 19 | extern inline cycles_t get_cycles(void) | 19 | extern inline cycles_t get_cycles(void) |
| 20 | { | 20 | { |