Pull platform-drivers into test branch

[pandora-kernel.git] / include / linux / timer.h

diff --git a/include/linux/timer.h b/include/linux/timer.h
index b5caabc..eeef664 100644 (file)
--- a/include/linux/timer.h
+++ b/include/linux/timer.h
@@ -1,12 +1,11 @@
 #ifndef _LINUX_TIMER_H
 #define _LINUX_TIMER_H
 
-#include <linux/config.h>
 #include <linux/list.h>
 #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 +14,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)                \
@@ -99,4 +98,10 @@ extern void run_local_timers(void);
 struct hrtimer;
 extern int it_real_fn(struct hrtimer *);
 
+unsigned long __round_jiffies(unsigned long j, int cpu);
+unsigned long __round_jiffies_relative(unsigned long j, int cpu);
+unsigned long round_jiffies(unsigned long j);
+unsigned long round_jiffies_relative(unsigned long j);
+
+
 #endif