diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-09-03 13:01:44 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-09-03 13:01:44 -0400 |
| commit | 01b944fe1cd4e21a2a9ed51adbdbafe2d5e905ba (patch) | |
| tree | 85f506cf9fce3d8fd47cf624dd8698472bffc13f /include/linux/timerqueue.h | |
| parent | e51e38494a8ecc18650efb0c840600637891de2c (diff) | |
| parent | 58f1eae48e5372200553de07b5ecc7574803ee91 (diff) | |
Merge branch 'next' into for-linus
Prepare first round of input updates for 4.3 merge window.
Diffstat (limited to 'include/linux/timerqueue.h')
| -rw-r--r-- | include/linux/timerqueue.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/timerqueue.h b/include/linux/timerqueue.h index a520fd70a59f..7eec17ad7fa1 100644 --- a/include/linux/timerqueue.h +++ b/include/linux/timerqueue.h | |||
| @@ -16,10 +16,10 @@ struct timerqueue_head { | |||
| 16 | }; | 16 | }; |
| 17 | 17 | ||
| 18 | 18 | ||
| 19 | extern void timerqueue_add(struct timerqueue_head *head, | 19 | extern bool timerqueue_add(struct timerqueue_head *head, |
| 20 | struct timerqueue_node *node); | 20 | struct timerqueue_node *node); |
| 21 | extern void timerqueue_del(struct timerqueue_head *head, | 21 | extern bool timerqueue_del(struct timerqueue_head *head, |
| 22 | struct timerqueue_node *node); | 22 | struct timerqueue_node *node); |
| 23 | extern struct timerqueue_node *timerqueue_iterate_next( | 23 | extern struct timerqueue_node *timerqueue_iterate_next( |
| 24 | struct timerqueue_node *node); | 24 | struct timerqueue_node *node); |
| 25 | 25 | ||