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

Pull HID subsystem updates from Jiri Kosina:
 "Apart from various driver updates and added support for a number of
  new devices (mostly multitouch ones, but not limited to), there is one
  change that is worth pointing out explicitly: creation of HID device
  groups and proper autoloading of hid-multitouch, implemented by Henrik
  Rydberg."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (50 commits)
  HID: wacom: fix build breakage without CONFIG_LEDS_CLASS
  HID: waltop: Extend barrel button fix
  HID: hyperv: Set the hid drvdata correctly
  HID: wacom: Unify speed setting
  HID: wacom: Add speed setting for Intuos4 WL
  HID: wacom: Move Graphire raport header check.
  HID: uclogic: Add support for UC-Logic TWHL850
  HID: explain the signed/unsigned handling in hid_add_field()
  HID: handle logical min/max signedness properly in parser
  HID: logitech: read all 32 bits of report type bitfield
  HID: wacom: Add LED selector control for Wacom Intuos4 WL
  HID: hid-multitouch: fix wrong protocol detection
  HID: wiimote: Fix IR data parser
  HID: wacom: Add tilt reporting for Intuos4 WL
  HID: multitouch: MT interface matching for Baanto
  HID: hid-multitouch: Only match MT interfaces
  HID: Create a common generic driver
  HID: hid-multitouch: Switch to device groups
  HID: Create a generic device group
  HID: Allow bus wildcard matching
  ...

1 files changed, 25 insertions, 9 deletions

diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index ffddcba32af6..e9c68fedfcff 100644
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -32,9 +32,13 @@ config HID
           If unsure, say Y.
 
 config HID_BATTERY_STRENGTH
-        bool
+        bool "Battery level reporting for HID devices"
         depends on HID && POWER_SUPPLY && HID = POWER_SUPPLY
         default n
+        ---help---
+        This option adds support of reporting battery strength (for HID devices
+        that support this feature) through power_supply class so that userspace
+        tools, such as upower, can display it.
 
 config HIDRAW
         bool "/dev/hidraw raw HID device support"
@@ -60,6 +64,18 @@ source "drivers/hid/usbhid/Kconfig"
 menu "Special HID drivers"
         depends on HID
 
+config HID_GENERIC
+        tristate "Generic HID driver"
+        depends on HID
+        default y
+        ---help---
+        Support for generic HID devices.
+
+        To compile this driver as a module, choose M here: the module
+        will be called hid-generic.
+
+        If unsure, say Y.
+
 config HID_A4TECH
         tristate "A4 tech mice" if EXPERT
         depends on USB_HID
@@ -92,6 +108,12 @@ config HID_APPLE
         Say Y here if you want support for keyboards of Apple iBooks, PowerBooks,
         MacBooks, MacBook Pros and Apple Aluminum.
 
+config HID_AUREAL
+        tristate "Aureal"
+        depends on USB_HID
+        ---help---
+        Support for Aureal Cy se W-01RN Remote Controller and other Aureal derived remotes.
+
 config HID_BELKIN
         tristate "Belkin Flip KVM and Wireless keyboard" if EXPERT
         depends on USB_HID
@@ -595,16 +617,10 @@ config THRUSTMASTER_FF
 config HID_WACOM
         tristate "Wacom Bluetooth devices support"
         depends on BT_HIDP
-        ---help---
-        Support for Wacom Graphire Bluetooth tablet.
-
-config HID_WACOM_POWER_SUPPLY
-        bool "Wacom Bluetooth devices power supply status support"
-        depends on HID_WACOM
+        depends on LEDS_CLASS
         select POWER_SUPPLY
         ---help---
-          Say Y here if you want to enable power supply status monitoring for
-          Wacom Bluetooth devices.
+        Support for Wacom Graphire Bluetooth and Intuos4 WL tablets.
 
 config HID_WIIMOTE
         tristate "Nintendo Wii Remote support"