summaryrefslogtreecommitdiff
path: root/drivers/input/touchscreen/tsc40.c
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2014-01-23 20:10:44 +0400
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2014-01-23 20:10:44 +0400
commit55df811f2066fcaec2548248f0a1a6a0c12dc6b8 (patch)
tree0850f490489e5b941692f3fe36dff5d2c1c35c3c /drivers/input/touchscreen/tsc40.c
parent8e2f2325b73f3e5e46ecffd291556f33b8e3f8c9 (diff)
parent497ab1f290a26fa9414c5c316515f1e2ddba0803 (diff)
downloadlinux-55df811f2066fcaec2548248f0a1a6a0c12dc6b8.tar.xz
Merge branch 'next' into for-linus
First round of input updates for 3.14.
Diffstat (limited to 'drivers/input/touchscreen/tsc40.c')
-rw-r--r--drivers/input/touchscreen/tsc40.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/input/touchscreen/tsc40.c b/drivers/input/touchscreen/tsc40.c
index eb96f168fb9d..29687872cb94 100644
--- a/drivers/input/touchscreen/tsc40.c
+++ b/drivers/input/touchscreen/tsc40.c
@@ -11,7 +11,6 @@
#include <linux/slab.h>
#include <linux/input.h>
#include <linux/serio.h>
-#include <linux/init.h>
#define PACKET_LENGTH 5
struct tsc_ser {