diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2006-01-19 11:39:33 -0500 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2006-01-19 11:39:33 -0500 |
| commit | 944d79559d154c12becde0dab327016cf438f46c (patch) | |
| tree | 50c101806f4d3b6585222dda060559eb4f3e005a /include/linux/timer.h | |
| parent | d087e4bdd24ebe3ae3d0b265b6573ec901af4b4b (diff) | |
| parent | 0f36b018b2e314d45af86449f1a97facb1fbe300 (diff) | |
Merge branch 'master' of /usr/src/ntfs-2.6/
Diffstat (limited to 'include/linux/timer.h')
| -rw-r--r-- | include/linux/timer.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/timer.h b/include/linux/timer.h index 72f3a7781106..9b9877fd2505 100644 --- a/include/linux/timer.h +++ b/include/linux/timer.h | |||
| @@ -96,6 +96,6 @@ static inline void add_timer(struct timer_list *timer) | |||
| 96 | 96 | ||
| 97 | extern void init_timers(void); | 97 | extern void init_timers(void); |
| 98 | extern void run_local_timers(void); | 98 | extern void run_local_timers(void); |
| 99 | extern void it_real_fn(unsigned long); | 99 | extern int it_real_fn(void *); |
| 100 | 100 | ||
| 101 | #endif | 101 | #endif |