vserver 1.9.5.x5

[linux-2.6.git] / include / asm-arm / mach / arch.h

diff --git a/include/asm-arm/mach/arch.h b/include/asm-arm/mach/arch.h
index 5c37b70..993467c 100644 (file)
--- 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,