Merge branch 'fortglx/3.9/time' of git://git.linaro.org/people/jstultz/linux into...

[firefly-linux-kernel-4.4.55.git] / arch / arm / include / asm / timex.h

diff --git a/arch/arm/include/asm/timex.h b/arch/arm/include/asm/timex.h
index 963342acebb7200445970aeb51907e6cdf2eceed..83f2aa83899c4b14cede7dd798178655884c951f 100644 (file)
--- a/arch/arm/include/asm/timex.h
+++ b/arch/arm/include/asm/timex.h
@@ -12,7 +12,6 @@
 #ifndef _ASMARM_TIMEX_H
 #define _ASMARM_TIMEX_H
 
-#include <asm/arch_timer.h>
 #ifdef CONFIG_ARCH_MULTIPLATFORM
 #define CLOCK_TICK_RATE 1000000
 #else
@@ -20,11 +19,6 @@
 #endif
 
 typedef unsigned long cycles_t;
-
-#ifdef ARCH_HAS_READ_CURRENT_TIMER
 #define get_cycles()   ({ cycles_t c; read_current_timer(&c) ? 0 : c; })
-#else
-#define get_cycles()   (0)
-#endif
 
 #endif