Merge branch 'uhid' into for-linus

Conflicts:
	drivers/hid/Kconfig

1 files changed, 21 insertions, 0 deletions

diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index 00445bc3019c..fbf49503508d 100644
--- 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