git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'v3.7-rc3' into next to sync up with recent USB and MFD changes
[pandora-kernel.git]
/
drivers
/
input
/
keyboard
/
Kconfig
diff --git
a/drivers/input/keyboard/Kconfig
b/drivers/input/keyboard/Kconfig
index
f483ce6
..
5a83afb
100644
(file)
--- 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.