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

Pull HID subsystem updates from Jiri Kosina:
 "HID subsystem and drivers update. Highlights:

   - new support of a group of Win7/Win8 multitouch devices, from
     Benjamin Tissoires

   - fix for compat interface brokenness in uhid, from Dmitry Torokhov

   - conversion of drivers to use hid_driver helper, by H Hartley
     Sweeten

   - HID over I2C transport received ACPI enumeration support, written
     by Mika Westerberg

   - there is an ongoing effort to make HID sensor hubs independent of
     USB transport.  The first self-contained part of this work is
     provided here, done by Mika Westerberg

   - a few smaller fixes here and there, support for a couple new
     devices added"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (43 commits)
  HID: Correct Logitech order in hid-ids.h
  HID: LG4FF: Remove unnecessary deadzone code
  HID: LG: Prevent the Logitech Gaming Wheels deadzone
  HID: LG: Fix detection of Logitech Speed Force Wireless (WiiWheel)
  HID: LG: Add support for Logitech Momo Force (Red) Wheel
  HID: hidraw: print message when succesfully initialized
  HID: logitech: split accel, brake for Driving Force wheel
  HID: logitech: add report descriptor for Driving Force wheel
  HID: add ThingM blink(1) USB RGB LED support
  HID: uhid: make creating devices work on 64/32 systems
  HID: wiimote: fix nunchuck button parser
  HID: blacklist Velleman data acquisition boards
  HID: sensor-hub: don't limit the driver only to USB bus
  HID: sensor-hub: get rid of unused sensor_hub_grabbed_usages[] table
  HID: extend autodetect to handle I2C sensors as well
  HID: ntrig: use input_configured() callback to set the name
  HID: multitouch: do not use pointers towards hid-core
  HID: add missing GENERIC_HARDIRQ dependency
  HID: multitouch: make MT_CLS_ALWAYS_TRUE the new default class
  HID: multitouch: fix protocol for Elo panels
  ...

1 files changed, 17 insertions, 1 deletions

diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index eae0c7e468cf..5f07d85c4189 100644
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -596,6 +596,12 @@ config HID_SPEEDLINK
         ---help---
         Support for Speedlink Vicious and Divine Cezanne mouse.
 
+config HID_STEELSERIES
+        tristate "Steelseries SRW-S1 steering wheel support"
+        depends on USB_HID
+        ---help---
+        Support for Steelseries SRW-S1 steering wheel
+
 config HID_SUNPLUS
         tristate "Sunplus wireless desktop"
         depends on USB_HID
@@ -655,6 +661,16 @@ config HID_TOPSEED
         Say Y if you have a TopSeed Cyberlink or BTC Emprex or Conceptronic
         CLLRCMCE remote control.
 
+config HID_THINGM
+        tristate "ThingM blink(1) USB RGB LED"
+        depends on USB_HID
+        depends on LEDS_CLASS
+        ---help---
+        Support for the ThingM blink(1) USB RGB LED. This driver registers a
+        Linux LED class instance, plus additional sysfs attributes to control
+        RGB colors, fade time and playing. The device is exposed through hidraw
+        to access other functions.
+
 config HID_THRUSTMASTER
         tristate "ThrustMaster devices support"
         depends on USB_HID
@@ -719,7 +735,7 @@ config HID_ZYDACRON
 
 config HID_SENSOR_HUB
         tristate "HID Sensors framework support"
-        depends on USB_HID
+        depends on USB_HID && GENERIC_HARDIRQS
         select MFD_CORE
         default n
         -- help---