diff options
author | 2012-05-24 01:13:01 -0700 | |
---|---|---|
committer | 2012-05-24 01:13:01 -0700 | |
commit | e644dae645e167d154c0526358940986682a72b0 (patch) | |
tree | 972993c6568085b8d407fc7e13de10f4b93c651d /lib/timerqueue.c | |
parent | Input: synaptics - fix regression with "image sensor" trackpads (diff) | |
parent | Input: matrix-keymap - fix building keymaps (diff) | |
download | linux-dev-e644dae645e167d154c0526358940986682a72b0.tar.xz linux-dev-e644dae645e167d154c0526358940986682a72b0.zip |
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 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include <linux/bug.h> #include <linux/timerqueue.h> #include <linux/rbtree.h> -#include <linux/module.h> +#include <linux/export.h> /** * timerqueue_add - Adds timer to timerqueue. |