diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2012-03-28 00:53:10 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2012-03-28 00:53:10 -0400 |
| commit | 18af30e259c25a64ad69bb749c661564bc886275 (patch) | |
| tree | 996c89594fd20f25fcc15b5843625d99473f6982 /lib/timerqueue.c | |
| parent | 691c01c3f0b3252308162de90edcd02f7ca1733c (diff) | |
| parent | 6658a6991cef75719a21441aa0b7f8d6821534ee (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into sh-latest
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. |