summaryrefslogtreecommitdiffstats
path: root/drivers/input/joydev.c
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2009-11-02 22:10:07 -0800
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2009-11-02 22:10:07 -0800
commit7a53c7f56bbfc9b0ef892e68f5cfae3d902544d1 (patch)
tree19dec256fc80ad06d631ece78b9eb68a457ce66b /drivers/input/joydev.c
parente57130698fe3dd2b7d617d90bbf86474473cb40c (diff)
parent012abeea669ea49636cf952d13298bb68654146a (diff)
downloadop-kernel-dev-7a53c7f56bbfc9b0ef892e68f5cfae3d902544d1.zip
op-kernel-dev-7a53c7f56bbfc9b0ef892e68f5cfae3d902544d1.tar.gz
Merge commit 'v2.6.32-rc5' into for-linus
Diffstat (limited to 'drivers/input/joydev.c')
-rw-r--r--drivers/input/joydev.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/input/joydev.c b/drivers/input/joydev.c
index 901b252..b1bd6dd 100644
--- a/drivers/input/joydev.c
+++ b/drivers/input/joydev.c
@@ -18,6 +18,7 @@
#include <linux/input.h>
#include <linux/kernel.h>
#include <linux/major.h>
+#include <linux/sched.h>
#include <linux/slab.h>
#include <linux/mm.h>
#include <linux/miscdevice.h>
OpenPOWER on IntegriCloud