Merge with /home/shaggy/git/linus-clean/

[karo-tx-linux.git] / include / linux / timer.h

diff --git a/include/linux/timer.h b/include/linux/timer.h
index 72f3a7781106ab1290198d25edd33a8723588e0b..9b9877fd25059e1ad919d9ba87924d6374b26716 100644 (file)
--- a/include/linux/timer.h
+++ b/include/linux/timer.h
@@ -96,6 +96,6 @@ static inline void add_timer(struct timer_list *timer)
 
 extern void init_timers(void);
 extern void run_local_timers(void);
-extern void it_real_fn(unsigned long);
+extern int it_real_fn(void *);
 
 #endif