Merge branches 'for-4.8/upstream-fixes', 'for-4.9/alps', 'for-4.9/hid-input', 'for...

[cascardo/linux.git] / drivers / hid / Kconfig

diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index 5f590e1..cd4599c 100644 (file)
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -457,8 +457,6 @@ config LOGITECH_FF
          - Logitech WingMan Cordless RumblePad
          - Logitech WingMan Cordless RumblePad 2
          - Logitech WingMan Force 3D
-         - Logitech Formula Force EX
-         - Logitech WingMan Formula Force GP
 
          and if you want to enable force feedback for them.
          Note: if you say N here, this device will still be supported, but without
@@ -488,15 +486,22 @@ config LOGIWHEELS_FF
        select INPUT_FF_MEMLESS
        default LOGITECH_FF
        help
-         Say Y here if you want to enable force feedback and range setting
+         Say Y here if you want to enable force feedback and range setting(*)
          support for following Logitech wheels:
+         - Logitech G25 (*)
+         - Logitech G27 (*)
+         - Logitech G29 (*)
          - Logitech Driving Force
-         - Logitech Driving Force Pro
-         - Logitech Driving Force GT
-         - Logitech G25
-         - Logitech G27
-         - Logitech MOMO/MOMO 2
-         - Logitech Formula Force EX
+         - Logitech Driving Force Pro (*)
+         - Logitech Driving Force GT (*)
+         - Logitech Driving Force EX/RX
+         - Logitech Driving Force Wireless
+         - Logitech Speed Force Wireless
+         - Logitech MOMO Force
+         - Logitech MOMO Racing Force
+         - Logitech Formula Force GP
+         - Logitech Formula Force EX/RX
+         - Logitech Wingman Formula Force GP
 
 config HID_MAGICMOUSE
        tristate "Apple Magic Mouse/Trackpad multi-touch support"
@@ -862,6 +867,7 @@ config HID_WACOM
        select POWER_SUPPLY
        select NEW_LEDS
        select LEDS_CLASS
+       select LEDS_TRIGGERS
        help
          Say Y here if you want to use the USB or BT version of the Wacom Intuos
          or Graphire tablet.