Merge branch 'for-4.12/asus' into for-linus

[karo-tx-linux.git] / drivers / hid / Kconfig

diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index 502444fff86903d110d49dc9f95aa1be422f2a42..fe40e5e499dd4122ce0f623d9df776c0a0cf2bdf 100644 (file)
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -98,6 +98,18 @@ config HID_A4TECH
        ---help---
        Support for A4 tech X5 and WOP-35 / Trust 450L mice.
 
+config HID_ACCUTOUCH
+       tristate "Accutouch touch device"
+       depends on USB_HID
+       ---help---
+         This selects a driver for the Accutouch 2216 touch controller.
+
+         The driver works around a problem in the reported device capabilities
+         which causes userspace to detect the device as a mouse rather than
+          a touchscreen.
+
+         Say Y here if you have a Accutouch 2216 touch controller.
+
 config HID_ACRUX
        tristate "ACRUX game controller support"
        depends on HID
@@ -218,7 +230,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
@@ -444,6 +457,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
 
@@ -584,6 +598,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