diff options
| author | Greg KH <gregkh@suse.de> | 2005-09-12 15:10:59 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-09-12 15:10:59 -0400 |
| commit | ad2c10f8f00d3fe2e37dd8a107e7cf4ac0459489 (patch) | |
| tree | 5571f6a5784f51efddf9c1ee0408894cd63a460f /include/linux/timer.h | |
| parent | 6b7839007098a6b5612d31690e11277d4242e6ae (diff) | |
| parent | 2ade81473636b33aaac64495f89a7dc572c529f0 (diff) | |
Merge ../torvalds-2.6/
Diffstat (limited to 'include/linux/timer.h')
| -rw-r--r-- | include/linux/timer.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/timer.h b/include/linux/timer.h index 221f81ac2002..3340f3bd135d 100644 --- a/include/linux/timer.h +++ b/include/linux/timer.h | |||
| @@ -32,6 +32,10 @@ extern struct timer_base_s __init_timer_base; | |||
| 32 | .magic = TIMER_MAGIC, \ | 32 | .magic = TIMER_MAGIC, \ |
| 33 | } | 33 | } |
| 34 | 34 | ||
| 35 | #define DEFINE_TIMER(_name, _function, _expires, _data) \ | ||
| 36 | struct timer_list _name = \ | ||
| 37 | TIMER_INITIALIZER(_function, _expires, _data) | ||
| 38 | |||
| 35 | void fastcall init_timer(struct timer_list * timer); | 39 | void fastcall init_timer(struct timer_list * timer); |
| 36 | 40 | ||
| 37 | /*** | 41 | /*** |