Merge tag 'armsoc-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...

[deliverable/linux.git] / drivers / hid / wacom_wac.h

diff --git a/drivers/hid/wacom_wac.h b/drivers/hid/wacom_wac.h
index 877c24a5df94ad5056983ca95c71bbe79588903f..25baa7f295997f65759d8da1c6dc239c01258156 100644 (file)
--- a/drivers/hid/wacom_wac.h
+++ b/drivers/hid/wacom_wac.h
@@ -47,8 +47,8 @@
 /* wacom data packet report IDs */
 #define WACOM_REPORT_PENABLED          2
 #define WACOM_REPORT_PENABLED_BT       3
-#define WACOM_REPORT_INTUOSREAD                5
-#define WACOM_REPORT_INTUOSWRITE       6
+#define WACOM_REPORT_INTUOS_ID1                5
+#define WACOM_REPORT_INTUOS_ID2                6
 #define WACOM_REPORT_INTUOSPAD         12
 #define WACOM_REPORT_INTUOS5PAD                3
 #define WACOM_REPORT_DTUSPAD           21
@@ -70,6 +70,7 @@
 #define WACOM_REPORT_DEVICE_LIST       16
 #define WACOM_REPORT_INTUOS_PEN                16
 #define WACOM_REPORT_REMOTE            17
+#define WACOM_REPORT_INTUOSHT2_ID      8
 
 /* device quirks */
 #define WACOM_QUIRK_BBTOUCH_LOWRES     0x0001