Merge Zaurus branch

[linux-2.6-omap-h63xx.git] / include / linux / timer.h

diff --git a/include/linux/timer.h b/include/linux/timer.h
index ee5a09e806e832f9cafd98823efec31cc87de52d..0a485beba9f511ddb935044bee1c7f6696c51214 100644 (file)
--- a/include/linux/timer.h
+++ b/include/linux/timer.h
@@ -6,7 +6,7 @@
 #include <linux/spinlock.h>
 #include <linux/stddef.h>
 
-struct timer_base_s;
+struct tvec_t_base_s;
 
 struct timer_list {
        struct list_head entry;
@@ -15,16 +15,16 @@ struct timer_list {
        void (*function)(unsigned long);
        unsigned long data;
 
-       struct timer_base_s *base;
+       struct tvec_t_base_s *base;
 };
 
-extern struct timer_base_s __init_timer_base;
+extern struct tvec_t_base_s boot_tvec_bases;
 
 #define TIMER_INITIALIZER(_function, _expires, _data) {                \
                .function = (_function),                        \
                .expires = (_expires),                          \
                .data = (_data),                                \
-               .base = &__init_timer_base,                     \
+               .base = &boot_tvec_bases,                       \
        }
 
 #define DEFINE_TIMER(_name, _function, _expires, _data)                \
@@ -96,6 +96,7 @@ static inline void add_timer(struct timer_list *timer)
 
 extern void init_timers(void);
 extern void run_local_timers(void);
-extern int it_real_fn(void *);
+struct hrtimer;
+extern int it_real_fn(struct hrtimer *);
 
 #endif