diff options
| author | Olof Johansson <olof@lixom.net> | 2012-09-16 23:12:26 -0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-09-16 23:13:04 -0400 |
| commit | f4936639bc4a75218b5598ff69c52b9a8dd7f23d (patch) | |
| tree | 9c08fc81cb3d3e658ca7f8dc20a949496d9e6130 /drivers/input/keyboard/Kconfig | |
| parent | d1226e8f98f130918265fb5b4dddcb60b783eb34 (diff) | |
| parent | 11964f53eb4d9ce59a058be9999d9cfcb1ced878 (diff) | |
Merge tag 'omap-devel-am33xx-for-v3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/soc
From Tony Lindgren:
From Paul Walmsley <paul@pwsan.com>:
AM33xx hwmod data and miscellaneous clock and hwmod fixes. AM33xx
should now boot on mainline after this is applied, according to
Vaibhav.
(The shortlog makes no sense here since it contains mostly the dependent
cleanups that are part of the preceding branches).
Signed-off-by: Olof Johansson <olof@lixom.net>
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 c50fa75416f8..b4b65af8612a 100644 --- a/drivers/input/keyboard/Kconfig +++ b/drivers/input/keyboard/Kconfig | |||
| @@ -533,7 +533,7 @@ config KEYBOARD_DAVINCI | |||
| 533 | 533 | ||
| 534 | config KEYBOARD_OMAP | 534 | config KEYBOARD_OMAP |
| 535 | tristate "TI OMAP keypad support" | 535 | tristate "TI OMAP keypad support" |
| 536 | depends on (ARCH_OMAP1 || ARCH_OMAP2) | 536 | depends on ARCH_OMAP1 |
| 537 | select INPUT_MATRIXKMAP | 537 | select INPUT_MATRIXKMAP |
| 538 | help | 538 | help |
| 539 | Say Y here if you want to use the OMAP keypad. | 539 | Say Y here if you want to use the OMAP keypad. |