diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-06-25 01:20:01 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-06-25 01:20:01 +0000 |
| commit | 3797ba0b62debb71af4606910acacc9896a9ae3b (patch) | |
| tree | 414eea76253c7871bfdf3bd9d1817771eb40917c /include/linux/timer.h | |
| parent | 2b6c0c580795a4404f72d2a794214dd9e080709d (diff) | |
Merge with Linux 2.4.0-test2.
Diffstat (limited to 'include/linux/timer.h')
| -rw-r--r-- | include/linux/timer.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/include/linux/timer.h b/include/linux/timer.h index 45887372a..2de8050ea 100644 --- a/include/linux/timer.h +++ b/include/linux/timer.h @@ -1,8 +1,6 @@ #ifndef _LINUX_TIMER_H #define _LINUX_TIMER_H -#ifdef __KERNEL__ - #include <linux/config.h> #include <linux/list.h> @@ -93,11 +91,9 @@ extern int del_timer_sync(struct timer_list * timer); #define timer_set_running(t) (void)(t) #define timer_is_running(t) (0) #define timer_synchronize(t) do { (void)(t); barrier(); } while(0) -#define del_timer_sync del_timer +#define del_timer_sync(t) del_timer(t) #endif -#define del_timer_async del_timer - /* * These inlines deal with timer wrapping correctly. You are * strongly encouraged to use them @@ -116,4 +112,3 @@ extern int del_timer_sync(struct timer_list * timer); #define time_before_eq(a,b) time_after_eq(b,a) #endif -#endif |