diff options
| author | Dmitry Torokhov | 2012-10-30 08:20:56 +0100 |
|---|---|---|
| committer | Dmitry Torokhov | 2012-10-30 08:20:56 +0100 |
| commit | 53279f36dccffc26ff536003fd6bb97cc21c3b82 (patch) | |
| tree | 9d16e497c0e4158c7c054c479bd0e9ff0388d7bb /drivers/input/keyboard/Kconfig | |
| parent | Input: qt2160 - fix qt2160_write() implementation (diff) | |
| parent | Linux 3.7-rc3 (diff) | |
| download | kernel-qcow2-linux-53279f36dccffc26ff536003fd6bb97cc21c3b82.tar.gz kernel-qcow2-linux-53279f36dccffc26ff536003fd6bb97cc21c3b82.tar.xz kernel-qcow2-linux-53279f36dccffc26ff536003fd6bb97cc21c3b82.zip | |
Merge tag 'v3.7-rc3' into next to sync up with recent USB and MFD changes
Diffstat (limited to 'drivers/input/keyboard/Kconfig')
| -rw-r--r-- | drivers/input/keyboard/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig index f483ce65157f..5a83afb31219 100644 --- a/drivers/input/keyboard/Kconfig +++ b/drivers/input/keyboard/Kconfig @@ -533,7 +533,7 @@ config KEYBOARD_DAVINCI config KEYBOARD_OMAP tristate "TI OMAP keypad support" - depends on (ARCH_OMAP1 || ARCH_OMAP2) + depends on ARCH_OMAP1 select INPUT_MATRIXKMAP help Say Y here if you want to use the OMAP keypad. |