diff options
author | Len Brown <len.brown@intel.com> | 2012-04-06 21:48:59 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2012-04-06 21:48:59 -0400 |
commit | eeaab2d8af2cf1d36d7086f22e9de42d6dd2995c (patch) | |
tree | 369b9c91a6d808944f07d2290fec6f9fe2731904 /lib/timerqueue.c | |
parent | ee01e663373343c63e0e3d364d09f6155378dbcc (diff) | |
parent | aaef292acf3a78d9c0bb6fb72226077d286b45d7 (diff) |
Merge branches 'idle-fix' and 'misc' into release
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. |