aboutsummaryrefslogtreecommitdiff
path: root/drivers/input/misc
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-07-28 09:59:26 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-07-28 09:59:26 -0700
commitf934fb19ef34730263e6afc01e8ec27a8a71470f (patch)
tree6988fa3734adb98ab989657c56b7e31e94e723f8 /drivers/input/misc
parent3988ba0708e98b4bafc9034aa476775520bee708 (diff)
parent72d18a7b9e1a3a9511bae78fc7f0932ae01d5d73 (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: Input: add driver for Atmel integrated touchscreen controller Input: ads7846 - optimize order of calculating Rt in ads7846_rx() Input: ads7846 - fix sparse endian warnings Input: uinput - remove duplicate include Input: serio - offload resume to kseriod Input: serio - mark serio_register_driver() __must_check
Diffstat (limited to 'drivers/input/misc')
-rw-r--r--drivers/input/misc/uinput.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/input/misc/uinput.c b/drivers/input/misc/uinput.c
index 2bcfa0b3506..223d56d5555 100644
--- a/drivers/input/misc/uinput.c
+++ b/drivers/input/misc/uinput.c
@@ -37,7 +37,6 @@
#include <linux/fs.h>
#include <linux/miscdevice.h>
#include <linux/uinput.h>
-#include <linux/smp_lock.h>
static int uinput_dev_event(struct input_dev *dev, unsigned int type, unsigned int code, int value)
{