diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-15 16:41:39 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-15 16:41:39 -0400 |
commit | f2e1d89f9b349b3cd914b7c6ec6368632f4ad048 (patch) | |
tree | 5b0042924a9f9c8b3309c0be880f51795916fc28 /drivers/input/Kconfig | |
parent | 85ffdd28be04c324349dfc7c9de3d4342c885c3f (diff) | |
parent | 82ba56c273911f7eda79849cfa0fc2d2e5a3b75b (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: (40 commits)
Input: use full RCU API
Input: remove tsdev interface
Input: add support for Blackfin BF54x Keypad controller
Input: appletouch - another fix for idle reset logic
HWMON: hdaps - switch to using input-polldev
Input: add support for SEGA Dreamcast keyboard
Input: omap-keyboard - don't pretend we support changing keymap
Input: lifebook - fix X and Y axis range
Input: usbtouchscreen - add support for GeneralTouch devices
Input: fix open count handling in input interfaces
Input: keyboard - add CapsShift lock
Input: adbhid - produce all CapsLock key events
Input: ALPS - add signature for ThinkPad R61
Input: jornada720_kbd - send MSC_SCAN events
Input: add support for the HP Jornada 7xx (710/720/728) touchscreen
Input: add support for HP Jornada 7xx onboard keyboard
Input: add support for HP Jornada onboard keyboard (HP6XX)
Input: ucb1400_ts - use schedule_timeout_uninterruptible
Input: xpad - fix dependancy on LEDS class
Input: auto-select INPUT for MAC_EMUMOUSEBTN option
...
Resolved conflicts manually in drivers/hwmon/applesmc.c: converting from
a class device to a device and converting to use input-polldev created a
few apparently trivial clashes..
Diffstat (limited to 'drivers/input/Kconfig')
-rw-r--r-- | drivers/input/Kconfig | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/drivers/input/Kconfig b/drivers/input/Kconfig index 2d87357e2b2b..63512d906f02 100644 --- a/drivers/input/Kconfig +++ b/drivers/input/Kconfig | |||
@@ -114,28 +114,6 @@ config INPUT_JOYDEV | |||
114 | To compile this driver as a module, choose M here: the | 114 | To compile this driver as a module, choose M here: the |
115 | module will be called joydev. | 115 | module will be called joydev. |
116 | 116 | ||
117 | config INPUT_TSDEV | ||
118 | tristate "Touchscreen interface" | ||
119 | ---help--- | ||
120 | Say Y here if you have an application that only can understand the | ||
121 | Compaq touchscreen protocol for absolute pointer data. This is | ||
122 | useful namely for embedded configurations. | ||
123 | |||
124 | If unsure, say N. | ||
125 | |||
126 | To compile this driver as a module, choose M here: the | ||
127 | module will be called tsdev. | ||
128 | |||
129 | config INPUT_TSDEV_SCREEN_X | ||
130 | int "Horizontal screen resolution" | ||
131 | depends on INPUT_TSDEV | ||
132 | default "240" | ||
133 | |||
134 | config INPUT_TSDEV_SCREEN_Y | ||
135 | int "Vertical screen resolution" | ||
136 | depends on INPUT_TSDEV | ||
137 | default "320" | ||
138 | |||
139 | config INPUT_EVDEV | 117 | config INPUT_EVDEV |
140 | tristate "Event interface" | 118 | tristate "Event interface" |
141 | help | 119 | help |