Merge branch 'wacom' into next

Merge large update to Wacom driver, converting it from USB to a HID driver and unifying wired and bluetooth support, from Benjamin Tissoires.
2014-08-06 23:31:48 -07:00
parent 62238f3aad f2e0a7d4a0
commit fc8104bc5a
11 changed files with 1378 additions and 2136 deletions
--- a/include/linux/hid.h
+++ b/include/linux/hid.h
@@ -310,6 +310,11 @@ struct hid_item {
 */
 #define HID_GROUP_RMI				0x0100

+/*
+ * Vendor specific HID device groups
+ */
+#define HID_GROUP_WACOM				0x0101
+
 /*
 * This is the global environment of the parser. This information is
 * persistent for main-items. The global environment can be saved and