diff options
author | David S. Miller <davem@davemloft.net> | 2015-01-07 04:29:20 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-01-07 04:29:20 +0100 |
commit | 44d84d7272e5848878a96029b8a8b6e86854f146 (patch) | |
tree | 91b188c0ae21255510ace7507d42cdf0e8f6f5ae /drivers/input/keyboard/Kconfig | |
parent | net: eth: xgene: change APM X-Gene SoC platform ethernet to support ACPI (diff) | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
download | linux-44d84d7272e5848878a96029b8a8b6e86854f146.tar.xz linux-44d84d7272e5848878a96029b8a8b6e86854f146.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
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 |