diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-11-02 22:10:07 -0800 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-11-02 22:10:07 -0800 |
| commit | 7a53c7f56bbfc9b0ef892e68f5cfae3d902544d1 (patch) | |
| tree | 19dec256fc80ad06d631ece78b9eb68a457ce66b /drivers/input/serio | |
| parent | e57130698fe3dd2b7d617d90bbf86474473cb40c (diff) | |
| parent | 012abeea669ea49636cf952d13298bb68654146a (diff) | |
| download | op-kernel-dev-7a53c7f56bbfc9b0ef892e68f5cfae3d902544d1.zip op-kernel-dev-7a53c7f56bbfc9b0ef892e68f5cfae3d902544d1.tar.gz | |
Merge commit 'v2.6.32-rc5' into for-linus
Diffstat (limited to 'drivers/input/serio')
| -rw-r--r-- | drivers/input/serio/libps2.c | 1 | ||||
| -rw-r--r-- | drivers/input/serio/serio_raw.c | 1 | ||||
| -rw-r--r-- | drivers/input/serio/serport.c | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/drivers/input/serio/libps2.c b/drivers/input/serio/libps2.c index 769ba65..f3876ac 100644 --- a/drivers/input/serio/libps2.c +++ b/drivers/input/serio/libps2.c @@ -13,6 +13,7 @@ #include <linux/delay.h> #include <linux/module.h> +#include <linux/sched.h> #include <linux/slab.h> #include <linux/interrupt.h> #include <linux/input.h> diff --git a/drivers/input/serio/serio_raw.c b/drivers/input/serio/serio_raw.c index b03009b..27fdaaf 100644 --- a/drivers/input/serio/serio_raw.c +++ b/drivers/input/serio/serio_raw.c @@ -9,6 +9,7 @@ * the Free Software Foundation. */ +#include <linux/sched.h> #include <linux/slab.h> #include <linux/smp_lock.h> #include <linux/poll.h> diff --git a/drivers/input/serio/serport.c b/drivers/input/serio/serport.c index b9694b6..6d345112 100644 --- a/drivers/input/serio/serport.c +++ b/drivers/input/serio/serport.c @@ -15,6 +15,7 @@ #include <asm/uaccess.h> #include <linux/kernel.h> +#include <linux/sched.h> #include <linux/slab.h> #include <linux/module.h> #include <linux/init.h> |
