These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / hid / Kconfig

diff --git a/kernel/drivers/hid/Kconfig b/kernel/drivers/hid/Kconfig
index 15338af..513a16c 100644 (file)
--- a/kernel/drivers/hid/Kconfig
+++ b/kernel/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
@@ -251,6 +261,18 @@ config HID_EZKEY
        ---help---
        Support for Ezkey BTC 8193 keyboard.
 
+config HID_GEMBIRD
+       tristate "Gembird Joypad"
+       depends on HID
+       ---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
@@ -480,6 +502,7 @@ config HID_MULTITOUCH
          - Atmel panels
          - Cando dual touch panels
          - Chunghwa panels
+         - CJTouch panels
          - CVTouch panels
          - Cypress TrueTouch panels
          - Elan Microelectronics touch panels
@@ -634,7 +657,12 @@ config HID_PLANTRONICS
        tristate "Plantronics USB HID Driver"
        depends on HID
        ---help---
-       Provides HID support for Plantronics telephony devices.
+         Provides HID support for Plantronics USB audio devices.
+         Correctly maps vendor unique volume up/down HID usages to
+         KEY_VOLUMEUP and KEY_VOLUMEDOWN events and prevents core mapping
+         of other vendor unique HID usages to random mouse events.
+
+         Say M here if you may ever plug in a Plantronics USB audio device.
 
 config HID_PRIMAX
        tristate "Primax non-fully HID-compliant devices"
@@ -660,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"