Merge branches 'for-4.11/upstream-fixes', 'for-4.12/accutouch', 'for-4.12/cp2112...

[sfrench/cifs-2.6.git] / drivers / hid / Kconfig

diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index fb4cc0d28eea13076c600f6f566efdc8f2291ed9..816679150b3510bf928683750d09ec97dc6c3194 100644 (file)
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -187,11 +187,11 @@ config HID_CHERRY
        Support for Cherry Cymotion keyboard.
 
 config HID_CHICONY
-       tristate "Chicony Tactical pad"
+       tristate "Chicony devices"
        depends on HID
        default !EXPERT
        ---help---
-       Support for Chicony Tactical pad.
+       Support for Chicony Tactical pad and special keys on Chicony keyboards.
 
 config HID_CORSAIR
        tristate "Corsair devices"
@@ -202,6 +202,7 @@ config HID_CORSAIR
 
        Supported devices:
        - Vengeance K90
+       - Scimitar PRO RGB
 
 config HID_PRODIKEYS
        tristate "Prodikeys PC-MIDI Keyboard support"
@@ -226,7 +227,8 @@ config HID_CMEDIA
 
 config HID_CP2112
        tristate "Silicon Labs CP2112 HID USB-to-SMBus Bridge support"
-       depends on USB_HID && I2C && GPIOLIB && GPIOLIB_IRQCHIP
+       depends on USB_HID && I2C && GPIOLIB
+       select GPIOLIB_IRQCHIP
        ---help---
        Support for Silicon Labs CP2112 HID USB to SMBus Master Bridge.
        This is a HID device driver which registers as an i2c adapter
@@ -452,6 +454,7 @@ config HID_LOGITECH_DJ
 config HID_LOGITECH_HIDPP
        tristate "Logitech HID++ devices support"
        depends on HID_LOGITECH
+       select POWER_SUPPLY
        ---help---
        Support for Logitech devices relyingon the HID++ Logitech specification
 
@@ -592,6 +595,12 @@ config HID_MULTITOUCH
          To compile this driver as a module, choose M here: the
          module will be called hid-multitouch.
 
+config HID_NTI
+       tristate "NTI keyboard adapters"
+       ---help---
+       Support for the "extra" Sun keyboard keys on keyboards attached
+       through Network Technologies USB-SUN keyboard adapters.
+
 config HID_NTRIG
        tristate "N-Trig touch screen"
        depends on USB_HID