Merge branch 'uhid' into for-linus

[~andy/linux] / drivers / hid / Kconfig

diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index bef04c19276865ec74c06dfddf2cb90e06736c54..fbf49503508d8aa79a5e0cc4c901b716bb1233b6 100644 (file)
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -53,6 +53,27 @@ config HIDRAW
 
        If unsure, say Y.
 
+config UHID
+       tristate "User-space I/O driver support for HID subsystem"
+       depends on HID
+       default n
+       ---help---
+       Say Y here if you want to provide HID I/O Drivers from user-space.
+       This allows to write I/O drivers in user-space and feed the data from
+       the device into the kernel. The kernel parses the HID reports, loads the
+       corresponding HID Device Driver or provides input devices on top of your
+       user-space device.
+
+       This driver cannot be used to parse HID-reports in user-space and write
+       special HID-drivers. You should use hidraw for that.
+       Instead, this driver allows to write the transport-layer driver in
+       user-space like USB-HID and Bluetooth-HID do in kernel-space.
+
+       If unsure, say N.
+
+       To compile this driver as a module, choose M here: the
+       module will be called uhid.
+
 config HID_GENERIC
        tristate "Generic HID driver"
        depends on HID
@@ -193,10 +214,12 @@ config HID_EZKEY
        Support for Ezkey BTC 8193 keyboard.
 
 config HID_HOLTEK
-       tristate "Holtek On Line Grip based game controller support"
+       tristate "Holtek HID devices"
        depends on USB_HID
        ---help---
-         Say Y here if you have a Holtek On Line Grip based game controller.
+       Support for Holtek based devices:
+         - Holtek On Line Grip based game controller
+         - Trust GXT 18 Gaming Keyboard
 
 config HOLTEK_FF
        bool "Holtek On Line Grip force feedback support"
@@ -261,6 +284,19 @@ config HID_LCPOWER
        ---help---
        Support for LC-Power RC1000MCE RF remote control.
 
+config HID_LENOVO_TPKBD
+       tristate "Lenovo ThinkPad USB Keyboard with TrackPoint"
+       depends on USB_HID
+       select NEW_LEDS
+       select LEDS_CLASS
+       ---help---
+       Support for the Lenovo ThinkPad USB Keyboard with TrackPoint.
+
+       Say Y here if you have a Lenovo ThinkPad USB Keyboard with TrackPoint
+       and would like to use device-specific features like changing the
+       sensitivity of the trackpoint, using the microphone mute button or
+       controlling the mute and microphone mute LEDs.
+
 config HID_LOGITECH
        tristate "Logitech devices" if EXPERT
        depends on USB_HID
@@ -386,6 +422,7 @@ config HID_MULTITOUCH
          - Unitec Panels
          - XAT optical touch panels
          - Xiroku optical touch panels
+         - Zytronic touch panels
 
          If unsure, say N.