diff options
| author | Kevin Hilman <khilman@deeprootsystems.com> | 2010-10-21 14:21:55 -0400 |
|---|---|---|
| committer | Kevin Hilman <khilman@deeprootsystems.com> | 2010-10-21 14:21:55 -0400 |
| commit | 7940a34b2e1e0485211a17d8c3ab4da1ea3e1330 (patch) | |
| tree | fe08ba701cbf23ae44a16d3b7afa521fce943a8a /drivers/input/keyboard/Kconfig | |
| parent | 6451d7783ba5ff24eb1a544eaa6665b890f30466 (diff) | |
| parent | 8939b3504dc35224cb9c88e5af925b22ea9eee71 (diff) | |
Merge branch 'davinci-next' into davinci-for-linus
Conflicts:
arch/arm/mach-davinci/board-da830-evm.c
arch/arm/mach-davinci/board-da850-evm.c
Diffstat (limited to 'drivers/input/keyboard/Kconfig')
| -rw-r--r-- | drivers/input/keyboard/Kconfig | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig index aa037fec2f86..48cf9ec8baf2 100644 --- a/drivers/input/keyboard/Kconfig +++ b/drivers/input/keyboard/Kconfig | |||
| @@ -424,6 +424,15 @@ config KEYBOARD_OMAP | |||
| 424 | To compile this driver as a module, choose M here: the | 424 | To compile this driver as a module, choose M here: the |
| 425 | module will be called omap-keypad. | 425 | module will be called omap-keypad. |
| 426 | 426 | ||
| 427 | config KEYBOARD_TNETV107X | ||
| 428 | tristate "TI TNETV107X keypad support" | ||
| 429 | depends on ARCH_DAVINCI_TNETV107X | ||
| 430 | help | ||
| 431 | Say Y here if you want to use the TNETV107X keypad. | ||
| 432 | |||
| 433 | To compile this driver as a module, choose M here: the | ||
| 434 | module will be called tnetv107x-keypad. | ||
| 435 | |||
| 427 | config KEYBOARD_TWL4030 | 436 | config KEYBOARD_TWL4030 |
| 428 | tristate "TI TWL4030/TWL5030/TPS659x0 keypad support" | 437 | tristate "TI TWL4030/TWL5030/TPS659x0 keypad support" |
| 429 | depends on TWL4030_CORE | 438 | depends on TWL4030_CORE |