diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2015-02-10 11:26:38 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2015-02-10 11:26:38 +0100 |
| commit | df9ab9771c64f5229843bfe2a20fe0ee6ac59fc1 (patch) | |
| tree | a091be1024bd76627f78e791e377126e47703b7b /drivers/input/keyboard/Kconfig | |
| parent | Merge branches 'debug', 'fixes', 'l2c' (early part), 'misc' and 'sa1100' into... (diff) | |
| parent | ARM: kprobes: Fix compilation error caused by superfluous '*' (diff) | |
| download | linux-df9ab9771c64f5229843bfe2a20fe0ee6ac59fc1.tar.xz linux-df9ab9771c64f5229843bfe2a20fe0ee6ac59fc1.zip | |
Merge branch 'devel-stable' into for-next
Diffstat (limited to 'drivers/input/keyboard/Kconfig')
| -rw-r--r-- | drivers/input/keyboard/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig index 96ee26c555e0..a5d9b3f3c871 100644 --- a/drivers/input/keyboard/Kconfig +++ b/drivers/input/keyboard/Kconfig @@ -559,6 +559,7 @@ config KEYBOARD_SH_KEYSC config KEYBOARD_STMPE tristate "STMPE keypad support" depends on MFD_STMPE + depends on OF select INPUT_MATRIXKMAP help Say Y here if you want to use the keypad controller on STMPE I/O |