From: Jiri Kosina <jkosina@suse.cz>
Date: Tue, 24 Jul 2012 11:40:06 +0000 (+0200)
Subject: Merge branch 'uhid' into for-linus
X-Git-Tag: master-2012-08-06~102^2
X-Git-Url: http://pileus.org/git/?p=~andy%2Flinux;a=commitdiff_plain;h=c062c4d1de57789bf15f7641a24c429eeb8a1c6a

Merge branch 'uhid' into for-linus

Conflicts:
	drivers/hid/Kconfig
---

c062c4d1de57789bf15f7641a24c429eeb8a1c6a
diff --cc drivers/hid/Kconfig
index 00445bc3019,8cca0af2dbd..fbf49503508
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@@ -53,6 -59,32 +53,27 @@@ config HIDRA
  
  	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.
+ 
 -source "drivers/hid/usbhid/Kconfig"
 -
 -menu "Special HID drivers"
 -	depends on HID
 -
  config HID_GENERIC
  	tristate "Generic HID driver"
  	depends on HID