X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Fasm-arm%2Fmach%2Farch.h;h=993467c37b5bdb81a1d7e82cd3aa517a698db721;hb=6a77f38946aaee1cd85eeec6cf4229b204c15071;hp=5c37b709fe9f47e1fe4146996d8198895544fcea;hpb=87fc8d1bb10cd459024a742c6a10961fefcef18f;p=linux-2.6.git

diff --git a/include/asm-arm/mach/arch.h b/include/asm-arm/mach/arch.h
index 5c37b709f..993467c37 100644
--- a/include/asm-arm/mach/arch.h
+++ b/include/asm-arm/mach/arch.h
@@ -12,6 +12,7 @@
 
 struct tag;
 struct meminfo;
+struct sys_timer;
 
 struct machine_desc {
 	/*
@@ -39,7 +40,7 @@ struct machine_desc {
 					 struct meminfo *);
 	void			(*map_io)(void);/* IO mapping function	*/
 	void			(*init_irq)(void);
-	void			(*init_time)(void);
+	struct sys_timer	*timer;		/* system tick timer	*/
 	void			(*init_machine)(void);
 };
 
@@ -82,9 +83,6 @@ const struct machine_desc __mach_desc_##_type	\
 #define INITIRQ(_func)				\
 	.init_irq	= _func,
 
-#define INITTIME(_func)				\
-	.init_time	= _func,
-
 #define INIT_MACHINE(_func)			\
 	.init_machine	= _func,