From 1cb800ff90045fdf1d1077aed127a37a74b25a39 Mon Sep 17 00:00:00 2001 From: Linus Walleij Date: Thu, 8 Sep 2011 09:11:40 +0100 Subject: [PATCH] --- yaml --- r: 264637 b: refs/heads/master c: 1b56b17f9903b6a17b8bb8d72d885f6d12b4d597 h: refs/heads/master i: 264635: 3f8c9b020c34417de864275720f6f0dc91b676c4 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-integrator/integrator_ap.c | 12 ------------ 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/[refs] b/[refs] index dfc182b6fc12..17388bb80509 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a7b0ab5bd0459253aa5efba445969ba5200104de +refs/heads/master: 1b56b17f9903b6a17b8bb8d72d885f6d12b4d597 diff --git a/trunk/arch/arm/mach-integrator/integrator_ap.c b/trunk/arch/arm/mach-integrator/integrator_ap.c index fcf0ae95651f..aa30ab650183 100644 --- a/trunk/arch/arm/mach-integrator/integrator_ap.c +++ b/trunk/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)