diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2011-09-08 09:11:40 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-10-17 09:12:42 +0100 |
| commit | 1b56b17f9903b6a17b8bb8d72d885f6d12b4d597 (patch) | |
| tree | 8b4191efef46dad87824abad439d9dfae45118a4 | |
| parent | a7b0ab5bd0459253aa5efba445969ba5200104de (diff) | |
| download | blackbird-op-linux-1b56b17f9903b6a17b8bb8d72d885f6d12b4d597.tar.gz blackbird-op-linux-1b56b17f9903b6a17b8bb8d72d885f6d12b4d597.zip | |
ARM: 7084/1: mach-integrator: retire some timer macros
These macros are not used by anything since the switch to
generic time in commit b9cedda230793cbf58eb012ddadedd490cc8e129
so let's retire them.
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| -rw-r--r-- | arch/arm/mach-integrator/integrator_ap.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/arch/arm/mach-integrator/integrator_ap.c b/arch/arm/mach-integrator/integrator_ap.c index fcf0ae95651f..aa30ab650183 100644 --- a/arch/arm/mach-integrator/integrator_ap.c +++ b/arch/arm/mach-integrator/integrator_ap.c @@ -320,18 +320,6 @@ static void __init ap_init(void) #define TIMER1_VA_BASE IO_ADDRESS(INTEGRATOR_TIMER1_BASE) #define TIMER2_VA_BASE IO_ADDRESS(INTEGRATOR_TIMER2_BASE) -/* - * How long is the timer interval? - */ -#define TIMER_INTERVAL (TICKS_PER_uSEC * mSEC_10) -#if TIMER_INTERVAL >= 0x100000 -#define TICKS2USECS(x) (256 * (x) / TICKS_PER_uSEC) -#elif TIMER_INTERVAL >= 0x10000 -#define TICKS2USECS(x) (16 * (x) / TICKS_PER_uSEC) -#else -#define TICKS2USECS(x) ((x) / TICKS_PER_uSEC) -#endif - static unsigned long timer_reload; static void integrator_clocksource_init(u32 khz) |
