Merge branches 'for-3.19/upstream-fixes', 'for-3.20/apple', 'for-3.20/betop', 'for...

[mirror_ubuntu-artful-kernel.git] / drivers / hid / Kconfig

diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index dfdc26970022998adfb951f50baacb0e4df38474..152b006833cda2518614f80b4cac15b518b0ef0b 100644 (file)
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -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"