diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-12-30 04:10:06 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-12-30 04:10:06 -0500 |
| commit | 1dd3294677d5484e4813c6c454ba7f192a3ef61d (patch) | |
| tree | e29306ffe8b709a7499a25ecbe3234f833fc7002 /drivers/input/keyboard/Kconfig | |
| parent | 4a6908a3a050aacc9c3a2f36b276b46c0629ad91 (diff) | |
| parent | e941da3110422c4e57c3d05759fb9475b28f45f6 (diff) | |
Merge branch 'next' into for-linus
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 efd70a974591..35561689ff38 100644 --- a/drivers/input/keyboard/Kconfig +++ b/drivers/input/keyboard/Kconfig | |||
| @@ -268,6 +268,15 @@ config KEYBOARD_PXA27x | |||
| 268 | To compile this driver as a module, choose M here: the | 268 | To compile this driver as a module, choose M here: the |
| 269 | module will be called pxa27x_keypad. | 269 | module will be called pxa27x_keypad. |
| 270 | 270 | ||
| 271 | config KEYBOARD_PXA930_ROTARY | ||
| 272 | tristate "PXA930/PXA935 Enhanced Rotary Controller Support" | ||
| 273 | depends on CPU_PXA930 || CPU_PXA935 | ||
| 274 | help | ||
| 275 | Enable support for PXA930/PXA935 Enhanced Rotary Controller. | ||
| 276 | |||
| 277 | To compile this driver as a module, choose M here: the | ||
| 278 | module will be called pxa930_rotary. | ||
| 279 | |||
| 271 | config KEYBOARD_AAED2000 | 280 | config KEYBOARD_AAED2000 |
| 272 | tristate "AAED-2000 keyboard" | 281 | tristate "AAED-2000 keyboard" |
| 273 | depends on MACH_AAED2000 | 282 | depends on MACH_AAED2000 |