Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/dtor/input

[linux-drm-fsl-dcu.git] / drivers / input / keyboard / Kconfig

diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig
index c845d5c4cbbac814879ef3e2e476b4cbed23390b..9f42e4d3649efe83178e2e89a2b9fd6c9debef72 100644 (file)
--- a/drivers/input/keyboard/Kconfig
+++ b/drivers/input/keyboard/Kconfig
@@ -214,6 +214,15 @@ config KEYBOARD_OMAP
          To compile this driver as a module, choose M here: the
          module will be called omap-keypad.
 
+config KEYBOARD_PXA27x
+       tristate "PXA27x keyboard support"
+       depends on PXA27x
+       help
+         Enable support for PXA27x matrix keyboard controller
+
+         To compile this driver as a module, choose M here: the
+         module will be called pxa27x_keyboard.
+
 config KEYBOARD_AAED2000
        tristate "AAED-2000 keyboard"
        depends on MACH_AAED2000