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