Merge branch 'xfs-O_TMPFILE-support' into for-next

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

diff --git a/drivers/input/keyboard/matrix_keypad.c b/drivers/input/keyboard/matrix_keypad.c
index 90ff73ace42496a26fbec96081847d4f23fcfae6..8d2e19e81e1e59b63c31eccd989b441f503e8706 100644 (file)
--- a/drivers/input/keyboard/matrix_keypad.c
+++ b/drivers/input/keyboard/matrix_keypad.c
@@ -14,7 +14,6 @@
 #include <linux/types.h>
 #include <linux/delay.h>
 #include <linux/platform_device.h>
-#include <linux/init.h>
 #include <linux/input.h>
 #include <linux/irq.h>
 #include <linux/interrupt.h>