Merge branch 'master'

[linux-2.6-omap-h63xx.git] / arch / um / include / time_user.h

diff --git a/arch/um/include/time_user.h b/arch/um/include/time_user.h
index 6793a2fcd0aeed91c48d3182515bd09c2d1e45d6..17d7ef2141f4a0f6ba1e7188c2253f0ca3f1b945 100644 (file)
--- a/arch/um/include/time_user.h
+++ b/arch/um/include/time_user.h
@@ -8,11 +8,12 @@
 
 extern void timer(void);
 extern void switch_timers(int to_real);
-extern void set_interval(int timer_type);
 extern void idle_sleep(int secs);
 extern void enable_timer(void);
+extern void prepare_timer(void * ptr);
 extern void disable_timer(void);
 extern unsigned long time_lock(void);
 extern void time_unlock(unsigned long);
+extern void user_time_init(void);
 
 #endif