diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-02 11:20:33 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-02 11:20:33 -0400 |
| commit | a12f66fccf2e266ad197df142b5ebafc6a169a8c (patch) | |
| tree | 9d0bc76f8aa9c42fb44ce5f5bf6b4b09f4efafed /drivers/input/keyboard/Kconfig | |
| parent | 12dce6263d43daeb4e16fa4eb964c1c99fa4fa2e (diff) | |
| parent | bb0885900de49b5822d7e8c91c1adf9a0fcc228b (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (35 commits)
Input: wistron - add support for Acer TravelMate 2424NWXCi
Input: wistron - fix setting up special buttons
Input: add KEY_BLUETOOTH and KEY_WLAN definitions
Input: add new BUS_VIRTUAL bus type
Input: add driver for stowaway serial keyboards
Input: make input_register_handler() return error codes
Input: remove cruft that was needed for transition to sysfs
Input: fix input module refcounting
Input: constify input core
Input: libps2 - rearrange exports
Input: atkbd - support Microsoft Natural Elite Pro keyboards
Input: i8042 - disable MUX mode on Toshiba Equium A110
Input: i8042 - get rid of polling timer
Input: send key up events at disconnect
Input: constify psmouse driver
Input: i8042 - add Amoi to the MUX blacklist
Input: logips2pp - add sugnature 56 (Cordless MouseMan Wheel), cleanup
Input: add driver for Touchwin serial touchscreens
Input: add driver for Touchright serial touchscreens
Input: add driver for Penmount serial touchscreens
...
Diffstat (limited to 'drivers/input/keyboard/Kconfig')
| -rw-r--r-- | drivers/input/keyboard/Kconfig | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig index 83eac3a66bc8..c62e00c79dec 100644 --- a/drivers/input/keyboard/Kconfig +++ b/drivers/input/keyboard/Kconfig | |||
| @@ -121,6 +121,17 @@ config KEYBOARD_NEWTON | |||
| 121 | To compile this driver as a module, choose M here: the | 121 | To compile this driver as a module, choose M here: the |
| 122 | module will be called newtonkbd. | 122 | module will be called newtonkbd. |
| 123 | 123 | ||
| 124 | config KEYBOARD_STOWAWAY | ||
| 125 | tristate "Stowaway keyboard" | ||
| 126 | select SERIO | ||
| 127 | help | ||
| 128 | Say Y here if you have a Stowaway keyboard on a serial port. | ||
| 129 | Stowaway compatible keyboards like Dicota Input-PDA keyboard | ||
| 130 | are also supported by this driver. | ||
| 131 | |||
| 132 | To compile this driver as a module, choose M here: the | ||
| 133 | module will be called stowaway. | ||
| 134 | |||
| 124 | config KEYBOARD_CORGI | 135 | config KEYBOARD_CORGI |
| 125 | tristate "Corgi keyboard" | 136 | tristate "Corgi keyboard" |
| 126 | depends on PXA_SHARPSL | 137 | depends on PXA_SHARPSL |