diff options
author | Jens Axboe <jens.axboe@oracle.com> | 2009-10-05 09:30:10 +0200 |
---|---|---|
committer | Jens Axboe <jens.axboe@oracle.com> | 2009-10-05 09:30:10 +0200 |
commit | 5d13379a4dba717fb75b749acc0f928c2c02db17 (patch) | |
tree | ab5bf870206e6ea8e744390cdb37cb14f7e78257 /drivers/hid/hidraw.c | |
parent | 08dc8726d4be85bca793141c827574fd32a681bb (diff) | |
parent | 374576a8b6f865022c0fd1ca62396889b23d66dd (diff) | |
download | kernel-crypto-5d13379a4dba717fb75b749acc0f928c2c02db17.tar.gz kernel-crypto-5d13379a4dba717fb75b749acc0f928c2c02db17.tar.xz kernel-crypto-5d13379a4dba717fb75b749acc0f928c2c02db17.zip |
Merge branch 'master' into for-2.6.33
Diffstat (limited to 'drivers/hid/hidraw.c')
-rw-r--r-- | drivers/hid/hidraw.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/hid/hidraw.c b/drivers/hid/hidraw.c index 0c6639ea03d..ba05275e510 100644 --- a/drivers/hid/hidraw.c +++ b/drivers/hid/hidraw.c @@ -30,6 +30,7 @@ #include <linux/major.h> #include <linux/hid.h> #include <linux/mutex.h> +#include <linux/sched.h> #include <linux/smp_lock.h> #include <linux/hidraw.h> |