summaryrefslogtreecommitdiffstats
path: root/drivers/input
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/keyboard/Kconfig1
-rw-r--r--drivers/input/keyboard/omap4-keypad.c2
2 files changed, 1 insertions, 2 deletions
diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig
index 3371954c979b..f354813a13e8 100644
--- a/drivers/input/keyboard/Kconfig
+++ b/drivers/input/keyboard/Kconfig
@@ -513,7 +513,6 @@ config KEYBOARD_OMAP
513 513
514config KEYBOARD_OMAP4 514config KEYBOARD_OMAP4
515 tristate "TI OMAP4 keypad support" 515 tristate "TI OMAP4 keypad support"
516 depends on ARCH_OMAP4
517 help 516 help
518 Say Y here if you want to use the OMAP4 keypad. 517 Say Y here if you want to use the OMAP4 keypad.
519 518
diff --git a/drivers/input/keyboard/omap4-keypad.c b/drivers/input/keyboard/omap4-keypad.c
index d5c5d77f4b82..e809ac095a38 100644
--- a/drivers/input/keyboard/omap4-keypad.c
+++ b/drivers/input/keyboard/omap4-keypad.c
@@ -31,7 +31,7 @@
31#include <linux/slab.h> 31#include <linux/slab.h>
32#include <linux/pm_runtime.h> 32#include <linux/pm_runtime.h>
33 33
34#include <plat/omap4-keypad.h> 34#include <linux/platform_data/omap4-keypad.h>
35 35
36/* OMAP4 registers */ 36/* OMAP4 registers */
37#define OMAP4_KBD_REVISION 0x00 37#define OMAP4_KBD_REVISION 0x00