diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-04 21:13:17 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-04 21:16:12 -0400 |
| commit | a3d52136ee8f7399859f9a0824470fd49b1d1a00 (patch) | |
| tree | ac0fd3d1efc356029cbbc5e413f778f7231cd909 /drivers/input/keyboard/Kconfig | |
| parent | 5b339915762d30b21995aa7263e74081f2f1110a (diff) | |
| parent | 84767d00a8fd54dd97866561f6e2ee246c8e1cdc (diff) | |
Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/dtor/input
* 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/dtor/input: (65 commits)
Input: gpio_keys - add support for switches (EV_SW)
Input: cobalt_btns - convert to use polldev library
Input: add skeleton for simple polled devices
Input: update some documentation
Input: wistron - fix typo in keymap for Acer TM610
Input: add input_set_capability() helper
Input: i8042 - add Fujitsu touchscreen/touchpad PNP IDs
Input: i8042 - add Panasonic CF-29 to nomux list
Input: lifebook - split into 2 devices
Input: lifebook - add signature of Panasonic CF-29
Input: lifebook - activate 6-byte protocol on select models
Input: lifebook - work properly on Panasonic CF-18
Input: cobalt buttons - separate device and driver registration
Input: ati_remote - make button repeat sensitivity configurable
Input: pxa27x - do not use deprecated SA_INTERRUPT flag
Input: ucb1400 - make delays configurable
Input: misc devices - switch to using input_dev->dev.parent
Input: joysticks - switch to using input_dev->dev.parent
Input: touchscreens - switch to using input_dev->dev.parent
Input: mice - switch to using input_dev->dev.parent
...
Fixed up conflicts with core device model removal of "struct subsystem" manually.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
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 c845d5c4cbb..9f42e4d3649 100644 --- a/drivers/input/keyboard/Kconfig +++ b/drivers/input/keyboard/Kconfig | |||
| @@ -214,6 +214,15 @@ config KEYBOARD_OMAP | |||
| 214 | To compile this driver as a module, choose M here: the | 214 | To compile this driver as a module, choose M here: the |
| 215 | module will be called omap-keypad. | 215 | module will be called omap-keypad. |
| 216 | 216 | ||
| 217 | config KEYBOARD_PXA27x | ||
| 218 | tristate "PXA27x keyboard support" | ||
| 219 | depends on PXA27x | ||
| 220 | help | ||
| 221 | Enable support for PXA27x matrix keyboard controller | ||
| 222 | |||
| 223 | To compile this driver as a module, choose M here: the | ||
| 224 | module will be called pxa27x_keyboard. | ||
| 225 | |||
| 217 | config KEYBOARD_AAED2000 | 226 | config KEYBOARD_AAED2000 |
| 218 | tristate "AAED-2000 keyboard" | 227 | tristate "AAED-2000 keyboard" |
| 219 | depends on MACH_AAED2000 | 228 | depends on MACH_AAED2000 |