diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-05-24 04:13:01 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-05-24 04:13:01 -0400 |
| commit | e644dae645e167d154c0526358940986682a72b0 (patch) | |
| tree | 972993c6568085b8d407fc7e13de10f4b93c651d /lib/timerqueue.c | |
| parent | 899c612d74d4a242158a4db20367388d6299c028 (diff) | |
| parent | 86809173ce32ef03bd4d0389dfc72df0c805e9c4 (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'lib/timerqueue.c')
| -rw-r--r-- | lib/timerqueue.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/timerqueue.c b/lib/timerqueue.c index 191176a43e9a..a382e4a32609 100644 --- a/lib/timerqueue.c +++ b/lib/timerqueue.c | |||
| @@ -22,9 +22,10 @@ | |||
| 22 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 22 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 23 | */ | 23 | */ |
| 24 | 24 | ||
| 25 | #include <linux/bug.h> | ||
| 25 | #include <linux/timerqueue.h> | 26 | #include <linux/timerqueue.h> |
| 26 | #include <linux/rbtree.h> | 27 | #include <linux/rbtree.h> |
| 27 | #include <linux/module.h> | 28 | #include <linux/export.h> |
| 28 | 29 | ||
| 29 | /** | 30 | /** |
| 30 | * timerqueue_add - Adds timer to timerqueue. | 31 | * timerqueue_add - Adds timer to timerqueue. |