Merge remote-tracking branch 'agust/next' into next

[~andy/linux] / drivers / input / keyboard / stmpe-keypad.c

diff --git a/drivers/input/keyboard/stmpe-keypad.c b/drivers/input/keyboard/stmpe-keypad.c
index 5cbec56f772000f2b10836ef6585c65472f96b2d..c6727dda68f2901e10305ca15135def55c1e5675 100644 (file)
--- a/drivers/input/keyboard/stmpe-keypad.c
+++ b/drivers/input/keyboard/stmpe-keypad.c
@@ -6,7 +6,6 @@
  */
 
 #include <linux/module.h>
-#include <linux/init.h>
 #include <linux/slab.h>
 #include <linux/input.h>
 #include <linux/interrupt.h>