Merge branch 'for-2637/i2c/samsung' into next-i2c

[~andy/linux] / drivers / hid / Kconfig

diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index 2072e0138e9fd2ef1c0322a229ef6622a45b2aa3..3052e2969ad03c049f77f4956ea804e60eea8123 100644 (file)
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -176,6 +176,18 @@ config HID_KYE
        ---help---
        Support for Kye/Genius Ergo Mouse.
 
+config HID_UCLOGIC
+       tristate "UC-Logic"
+       depends on USB_HID
+       ---help---
+       Support for UC-Logic tablets.
+
+config HID_WALTOP
+       tristate "Waltop"
+       depends on USB_HID
+       ---help---
+       Support for Waltop tablets.
+
 config HID_GYRATION
        tristate "Gyration remote control"
        depends on USB_HID
@@ -220,12 +232,12 @@ config LOGITECH_FF
          force feedback.
 
 config LOGIRUMBLEPAD2_FF
-       bool "Logitech Rumblepad 2 force feedback support"
+       bool "Logitech RumblePad/Rumblepad 2 force feedback support"
        depends on HID_LOGITECH
        select INPUT_FF_MEMLESS
        help
          Say Y here if you want to enable force feedback support for Logitech
-         Rumblepad 2 devices.
+         RumblePad and Rumblepad 2 devices.
 
 config LOGIG940_FF
        bool "Logitech Flight System G940 force feedback support"
@@ -235,6 +247,14 @@ config LOGIG940_FF
          Say Y here if you want to enable force feedback support for Logitech
          Flight System G940 devices.
 
+config LOGIWII_FF
+       bool "Logitech Speed Force Wireless force feedback support"
+       depends on HID_LOGITECH
+       select INPUT_FF_MEMLESS
+       help
+         Say Y here if you want to enable force feedback support for Logitech
+         Speed Force Wireless (Wii) devices.
+
 config HID_MAGICMOUSE
        tristate "Apple MagicMouse multi-touch support"
        depends on BT_HIDP
@@ -376,6 +396,13 @@ config HID_ROCCAT_KONE
        ---help---
        Support for Roccat Kone mouse.
 
+config HID_ROCCAT_PYRA
+       tristate "Roccat Pyra mouse support"
+       depends on USB_HID
+       select HID_ROCCAT
+       ---help---
+       Support for Roccat Pyra mouse.
+
 config HID_SAMSUNG
        tristate "Samsung InfraRed remote control or keyboards"
        depends on USB_HID