diff options
| author |   Michal Marek <mmarek@suse.cz> | 2011-06-08 16:01:34 +0200 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2011-06-08 16:01:34 +0200 |
| commit | a61944c251c3e68c4bbf6eb96ff61c7b286351c5 (patch) | |
| tree | fd9f82297805d043a45a828626dfd29bddc48b00 /include/linux/timerqueue.h | |
| parent | Merge branch 'kbuild/kconfig-for-40' into kbuild/kconfig (diff) | |
| parent | Linux 3.0-rc1 (diff) | |
Merge commit 'v3.0-rc1' into kbuild/kconfig
Diffstat (limited to 'include/linux/timerqueue.h')
| -rw-r--r-- | include/linux/timerqueue.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/timerqueue.h b/include/linux/timerqueue.h index d24aabaca474..5088727478fd 100644 --- a/include/linux/timerqueue.h +++ b/include/linux/timerqueue.h @@ -24,7 +24,7 @@ extern struct timerqueue_node *timerqueue_iterate_next( struct timerqueue_node *node); /** - * timerqueue_getnext - Returns the timer with the earlies expiration time + * timerqueue_getnext - Returns the timer with the earliest expiration time * * @head: head of timerqueue * @@ -39,7 +39,7 @@ struct timerqueue_node *timerqueue_getnext(struct timerqueue_head *head) static inline void timerqueue_init(struct timerqueue_node *node) { - RB_CLEAR_NODE(&node->node); + rb_init_node(&node->node); } static inline void timerqueue_init_head(struct timerqueue_head *head) |