diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-11-08 11:51:52 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-11-08 11:51:52 -0500 |
| commit | fa8e2458ecfc959cd627e25ba86d8eddcb63c887 (patch) | |
| tree | d8c9dec3dac8e97e8591e6507a619959449d6344 /drivers/input/keyboard/Kconfig | |
| parent | d56a289be2ce01d1aa426a6cf45dede14a8db41e (diff) | |
| parent | 3d70f8c617a436c7146ecb81df2265b4626dfe89 (diff) | |
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 | |||
| 335 | config KEYBOARD_LPC32XX | 335 | config KEYBOARD_LPC32XX |
| 336 | tristate "LPC32XX matrix key scanner support" | 336 | tristate "LPC32XX matrix key scanner support" |
| 337 | depends on ARCH_LPC32XX && OF | 337 | depends on ARCH_LPC32XX && OF |
| 338 | select INPUT_MATRIXKMAP | ||
| 338 | help | 339 | help |
| 339 | Say Y here if you want to use NXP LPC32XX SoC key scanner interface, | 340 | Say Y here if you want to use NXP LPC32XX SoC key scanner interface, |
| 340 | connected to a key matrix. | 341 | connected to a key matrix. |