From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 18 Mar 2011 17:35:30 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
X-Git-Tag: v2.6.39-rc1~429
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=7fd23a24717a327a66f3c32d11a20a2f169c824f;p=~emulex%2Finfiniband.git

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (48 commits)
  HID: add support for Logitech Driving Force Pro wheel
  HID: hid-ortek: remove spurious reference
  HID: add support for Ortek PKB-1700
  HID: roccat-koneplus: vorrect mode of sysfs attr 'sensor'
  HID: hid-ntrig: init settle and mode check
  HID: merge hid-egalax into hid-multitouch
  HID: hid-multitouch: Send events per slot if CONTACTCOUNT is missing
  HID: ntrig remove if and drop an indent
  HID: ACRUX - activate the device immediately after binding
  HID: ntrig: apply NO_INIT_REPORTS quirk
  HID: hid-magicmouse: Correct touch orientation direction
  HID: ntrig don't dereference unclaimed hidinput
  HID: Do not create input devices for feature reports
  HID: bt hidp: send Output reports using SET_REPORT on the Control channel
  HID: hid-sony.c: Fix sending Output reports to the Sixaxis
  HID: add support for Keytouch IEC 60945
  HID: Add HID Report Descriptor to sysfs
  HID: add IRTOUCH infrared USB to hid_have_special_driver
  HID: kernel oops in out_cleanup in function hidinput_connect
  HID: Add teletext/color keys - gyration remote - EU version (GYAR3101CKDE)
  ...
---

7fd23a24717a327a66f3c32d11a20a2f169c824f
diff --cc drivers/hid/Kconfig
index 2560f01c1a6,d8123920f79..b7ec4057841
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@@ -180,10 -184,18 +184,18 @@@ config HID_EZKE
  	---help---
  	Support for Ezkey BTC 8193 keyboard.
  
+ config HID_KEYTOUCH
+ 	tristate "Keyoutch HID devices"
+ 	depends on USB_HID
+ 	---help---
+ 	Support for Keytouch HID devices not fully compliant with
+ 	the specification. Currently supported:
+ 		- Keytouch IEC 60945
+ 
  config HID_KYE
 -	tristate "Kye/Genius Ergo Mouse" if EMBEDDED
 +	tristate "Kye/Genius Ergo Mouse" if EXPERT
  	depends on USB_HID
 -	default !EMBEDDED
 +	default !EXPERT
  	---help---
  	Support for Kye/Genius Ergo Mouse.
  
@@@ -218,10 -230,16 +230,16 @@@ config HID_KENSINGTO
  	---help---
  	Support for Kensington Slimblade Trackball.
  
+ config HID_LCPOWER
+ 	tristate "LC-Power"
+ 	depends on USB_HID
+ 	---help---
+ 	Support for LC-Power RC1000MCE RF remote control.
+ 
  config HID_LOGITECH
 -	tristate "Logitech devices" if EMBEDDED
 +	tristate "Logitech devices" if EXPERT
  	depends on USB_HID
 -	default !EMBEDDED
 +	default !EXPERT
  	---help---
  	Support for Logitech devices that are not fully compliant with HID standard.