diff options
author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2013-10-21 11:07:04 +0200 |
---|---|---|
committer | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2013-12-20 17:17:16 +0100 |
commit | 79f08d9ed217318b4f325b7fcf8f26dcd0e41689 (patch) | |
tree | 06baef3f15fea814781dacfd241a6f2095fcf87e /arch/arm/include | |
parent | 53985371458fc17405c7fc277e6f05fe36965eab (diff) | |
download | linux-79f08d9ed217318b4f325b7fcf8f26dcd0e41689.tar.gz linux-79f08d9ed217318b4f325b7fcf8f26dcd0e41689.tar.bz2 linux-79f08d9ed217318b4f325b7fcf8f26dcd0e41689.zip |
ARM: drop <mach/timex.h> for !ARCH_MULTIPLATFORM, too
While <mach/timex.h> isn't used for multi-platform builds since long it
still is for "normal" builds. As the previous patches fix all sites to
not make use of this per-platform file, it can go now for good also for
platforms that are not (yet) converted to multi-platform.
While at it there are no users of CLOCK_TICK_RATE any more, so also drop
the dummy #define.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Diffstat (limited to 'arch/arm/include')
-rw-r--r-- | arch/arm/include/asm/timex.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/arm/include/asm/timex.h b/arch/arm/include/asm/timex.h index 83f2aa83899c..f6fcc67ef06e 100644 --- a/arch/arm/include/asm/timex.h +++ b/arch/arm/include/asm/timex.h @@ -12,12 +12,6 @@ #ifndef _ASMARM_TIMEX_H #define _ASMARM_TIMEX_H -#ifdef CONFIG_ARCH_MULTIPLATFORM -#define CLOCK_TICK_RATE 1000000 -#else -#include <mach/timex.h> -#endif - typedef unsigned long cycles_t; #define get_cycles() ({ cycles_t c; read_current_timer(&c) ? 0 : c; }) |