diff options
| author | Dmitry Torokhov | 2012-11-08 17:51:52 +0100 |
|---|---|---|
| committer | Dmitry Torokhov | 2012-11-08 17:51:52 +0100 |
| commit | fa8e2458ecfc959cd627e25ba86d8eddcb63c887 (patch) | |
| tree | d8c9dec3dac8e97e8591e6507a619959449d6344 /drivers/input/keyboard/Kconfig | |
| parent | Input: pwm-beeper - add devicetree probing support (diff) | |
| parent | Linux 3.7-rc4 (diff) | |
| download | kernel-qcow2-linux-fa8e2458ecfc959cd627e25ba86d8eddcb63c887.tar.gz kernel-qcow2-linux-fa8e2458ecfc959cd627e25ba86d8eddcb63c887.tar.xz kernel-qcow2-linux-fa8e2458ecfc959cd627e25ba86d8eddcb63c887.zip | |
Merge tag 'v3.7-rc4' into next to sync up Wacom bits
Linux 3.7-rc4
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 5a83afb31219..48309641b1b2 100644 --- a/drivers/input/keyboard/Kconfig +++ b/drivers/input/keyboard/Kconfig @@ -335,6 +335,7 @@ config KEYBOARD_LOCOMO config KEYBOARD_LPC32XX tristate "LPC32XX matrix key scanner support" depends on ARCH_LPC32XX && OF + select INPUT_MATRIXKMAP help Say Y here if you want to use NXP LPC32XX SoC key scanner interface, connected to a key matrix. |