Merge tag 'md/4.4-rc0-fix' of git://neil.brown.name/md

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

diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index 6ab51ae..513a16c 100644 (file)
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -171,6 +171,16 @@ config HID_CHICONY
        ---help---
        Support for Chicony Tactical pad.
 
+config HID_CORSAIR
+       tristate "Corsair devices"
+       depends on HID && USB && LEDS_CLASS
+       ---help---
+       Support for Corsair devices that are not fully compliant with the
+       HID standard.
+
+       Supported devices:
+       - Vengeance K90
+
 config HID_PRODIKEYS
        tristate "Prodikeys PC-MIDI Keyboard support"
        depends on HID && SND
@@ -257,6 +267,12 @@ config HID_GEMBIRD
        ---help---
        Support for Gembird JPD-DualForce 2.
 
+config HID_GFRM
+       tristate "Google Fiber TV Box remote control support"
+       depends on HID
+       ---help---
+       Support for Google Fiber TV Box remote controls
+
 config HID_HOLTEK
        tristate "Holtek HID devices"
        depends on USB_HID
@@ -672,9 +688,8 @@ config HID_SAITEK
 
        Supported devices:
        - PS1000 Dual Analog Pad
-       - R.A.T.9 Gaming Mouse
-       - R.A.T.7 Gaming Mouse
-       - M.M.O.7 Gaming Mouse
+       - Saitek R.A.T.7, R.A.T.9, M.M.O.7 Gaming Mice
+       - Mad Catz R.A.T.5, R.A.T.9 Gaming Mice
 
 config HID_SAMSUNG
        tristate "Samsung InfraRed remote control or keyboards"