X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=arch%2Farm%2Fmach-integrator%2Fintegrator_ap.c;h=b07e39d21cdf38cd6b3ab2ad6c3f63c27592b26d;hb=44c40f29869a02dd430beb7fed0b6ca7d8ef5e54;hp=ad667711d2bbcc62870df214488bf9f9115a320d;hpb=8d40237c730b8be87c1b80a5d96b9c603fefa829;p=linux-2.6.git

diff --git a/arch/arm/mach-integrator/integrator_ap.c b/arch/arm/mach-integrator/integrator_ap.c
index ad667711d..b07e39d21 100644
--- a/arch/arm/mach-integrator/integrator_ap.c
+++ b/arch/arm/mach-integrator/integrator_ap.c
@@ -40,9 +40,7 @@
 #include <asm/mach/flash.h>
 #include <asm/mach/irq.h>
 #include <asm/mach/map.h>
-#include <asm/mach/time.h>
 
-#include "common.h"
 
 /* 
  * All IO addresses are mapped onto VA 0xFFFx.xxxx, where x.xxxx
@@ -283,22 +281,17 @@ static void __init ap_init(void)
 	}
 }
 
-static void __init ap_init_timer(void)
+static void ap_time_init(void)
 {
 	integrator_time_init(1000000 * TICKS_PER_uSEC / HZ, 0);
 }
 
-static struct sys_timer ap_timer = {
-	.init		= ap_init_timer,
-	.offset		= integrator_gettimeoffset,
-};
-
 MACHINE_START(INTEGRATOR, "ARM-Integrator")
 	MAINTAINER("ARM Ltd/Deep Blue Solutions Ltd")
 	BOOT_MEM(0x00000000, 0x16000000, 0xf1600000)
 	BOOT_PARAMS(0x00000100)
 	MAPIO(ap_map_io)
 	INITIRQ(ap_init_irq)
-	.timer		= &ap_timer,
+	INITTIME(ap_time_init)
 	INIT_MACHINE(ap_init)
 MACHINE_END