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 f64ef77019a33af160e919baee0632a7e0957c4d..17d7ef2141f4a0f6ba1e7188c2253f0ca3f1b945 100644 (file)
--- a/arch/um/include/time_user.h
+++ b/arch/um/include/time_user.h
@@ -10,6 +10,7 @@ extern void timer(void);
 extern void switch_timers(int to_real);
 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);