Merge branch 'next' into for-linus

[~andy/linux] / drivers / input / touchscreen / elo.c

diff --git a/drivers/input/touchscreen/elo.c b/drivers/input/touchscreen/elo.c
index 957423d1471db4d873c3312c1df1e427b643514f..8051a4b704ea3b99f5d11ebc4dfd8857bfbb7a09 100644 (file)
--- a/drivers/input/touchscreen/elo.c
+++ b/drivers/input/touchscreen/elo.c
@@ -22,7 +22,6 @@
 #include <linux/slab.h>
 #include <linux/input.h>
 #include <linux/serio.h>
-#include <linux/init.h>
 #include <linux/ctype.h>
 
 #define DRIVER_DESC    "Elo serial touchscreen driver"