Merge master.kernel.org:/pub/scm/linux/kernel/git/dtor/input

[karo-tx-linux.git] / drivers / input / evdev.c

diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c
index a4c3729d39608d6f67f9a48547ab855407eef783..55a72592704cf5e1a497ae2805f6ff3c3f802c85 100644 (file)
--- a/drivers/input/evdev.c
+++ b/drivers/input/evdev.c
@@ -18,7 +18,6 @@
 #include <linux/init.h>
 #include <linux/input.h>
 #include <linux/major.h>
-#include <linux/smp_lock.h>
 #include <linux/device.h>
 #include <linux/compat.h>