diff options
Diffstat (limited to 'arch/arm/include/asm/timex.h')
-rw-r--r-- | arch/arm/include/asm/timex.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/arch/arm/include/asm/timex.h b/arch/arm/include/asm/timex.h index ce119442277c..83f2aa83899c 100644 --- a/arch/arm/include/asm/timex.h +++ b/arch/arm/include/asm/timex.h | |||
@@ -12,15 +12,13 @@ | |||
12 | #ifndef _ASMARM_TIMEX_H | 12 | #ifndef _ASMARM_TIMEX_H |
13 | #define _ASMARM_TIMEX_H | 13 | #define _ASMARM_TIMEX_H |
14 | 14 | ||
15 | #include <asm/arch_timer.h> | 15 | #ifdef CONFIG_ARCH_MULTIPLATFORM |
16 | #define CLOCK_TICK_RATE 1000000 | ||
17 | #else | ||
16 | #include <mach/timex.h> | 18 | #include <mach/timex.h> |
19 | #endif | ||
17 | 20 | ||
18 | typedef unsigned long cycles_t; | 21 | typedef unsigned long cycles_t; |
19 | |||
20 | #ifdef ARCH_HAS_READ_CURRENT_TIMER | ||
21 | #define get_cycles() ({ cycles_t c; read_current_timer(&c) ? 0 : c; }) | 22 | #define get_cycles() ({ cycles_t c; read_current_timer(&c) ? 0 : c; }) |
22 | #else | ||
23 | #define get_cycles() (0) | ||
24 | #endif | ||
25 | 23 | ||
26 | #endif | 24 | #endif |