Merge branches 'for-3.19/upstream-fixes', 'for-3.20/apple', 'for-3.20/betop', 'for-3.20/lenovo', 'for-3.20/logitech', 'for-3.20/rmi', 'for-3.20/upstream' and 'for-3.20/wacom' into for-linus
This commit is contained in:

@@ -147,6 +147,16 @@ config HID_BELKIN
|
||||
---help---
|
||||
Support for Belkin Flip KVM and Wireless keyboard.
|
||||
|
||||
config HID_BETOP_FF
|
||||
tristate "Betop Production Inc. force feedback support"
|
||||
depends on USB_HID
|
||||
select INPUT_FF_MEMLESS
|
||||
---help---
|
||||
Say Y here if you want to enable force feedback support for devices by
|
||||
BETOP Production Ltd.
|
||||
Currently the following devices are known to be supported:
|
||||
- BETOP 2185 PC & BFM MODE
|
||||
|
||||
config HID_CHERRY
|
||||
tristate "Cherry Cymotion keyboard" if EXPERT
|
||||
depends on HID
|
||||
@@ -389,7 +399,7 @@ config HID_LOGITECH_HIDPP
|
||||
Say Y if you want support for Logitech devices relying on the HID++
|
||||
specification. Such devices are the various Logitech Touchpads (T650,
|
||||
T651, TK820), some mice (Zone Touch mouse), or even keyboards (Solar
|
||||
Keayboard).
|
||||
Keyboard).
|
||||
|
||||
config LOGITECH_FF
|
||||
bool "Logitech force feedback support"
|
||||
|
Reference in New Issue
Block a user