Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

[mv-sheeva.git] / drivers / usb / input / Kconfig

diff --git a/drivers/usb/input/Kconfig b/drivers/usb/input/Kconfig
index 2e71d3cca198732ca12043ab24508b7dba88186f..69a9f3b6d0a9eaedb2d6c63078c02cc57ab0f4e3 100644 (file)
--- a/drivers/usb/input/Kconfig
+++ b/drivers/usb/input/Kconfig
@@ -58,13 +58,17 @@ config HID_PID
          devices.
 
 config LOGITECH_FF
-       bool "Logitech WingMan *3D support"
+       bool "Logitech devices support"
        depends on HID_FF
        select INPUT_FF_MEMLESS if USB_HID
        help
          Say Y here if you have one of these devices:
          - Logitech WingMan Cordless RumblePad
+         - Logitech WingMan Cordless RumblePad 2
          - Logitech WingMan Force 3D
+         - Logitech Formula Force EX
+         - Logitech MOMO Force wheel
+
          and if you want to enable force feedback for them.
          Note: if you say N here, this device will still be supported, but without
          force feedback.