summaryrefslogtreecommitdiff
path: root/arch/arm/include/asm/timex.h
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/include/asm/timex.h')
-rw-r--r--arch/arm/include/asm/timex.h6
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/arm/include/asm/timex.h b/arch/arm/include/asm/timex.h
index 5e711722ebf4..9acc135dad94 100644
--- a/arch/arm/include/asm/timex.h
+++ b/arch/arm/include/asm/timex.h
@@ -12,13 +12,9 @@
#ifndef _ASMARM_TIMEX_H
#define _ASMARM_TIMEX_H
-#include <asm/arch_timer.h>
#include <mach/timex.h>
-#ifdef ARCH_HAS_READ_CURRENT_TIMER
+typedef unsigned long cycles_t;
#define get_cycles() ({ cycles_t c; read_current_timer(&c) ? 0 : c; })
-#endif
-
-#include <asm-generic/timex.h>
#endif