Merge branches 'for-4.10/asus', 'for-4.10/cp2112', 'for-4.10/i2c-hid-nopower', 'for...

[sfrench/cifs-2.6.git] / include / linux / hid.h

diff --git a/include/linux/hid.h b/include/linux/hid.h
index b2ec82712baac8e5ead67ea20d4f55372a8e74a2..28f38e2b8f309387b7a983937b50908c3095f7d9 100644 (file)
--- a/include/linux/hid.h
+++ b/include/linux/hid.h
@@ -231,7 +231,11 @@ struct hid_item {
 #define HID_DG_TAP             0x000d0035
 #define HID_DG_TABLETFUNCTIONKEY       0x000d0039
 #define HID_DG_PROGRAMCHANGEKEY        0x000d003a
+#define HID_DG_BATTERYSTRENGTH 0x000d003b
 #define HID_DG_INVERT          0x000d003c
+#define HID_DG_TILT_X          0x000d003d
+#define HID_DG_TILT_Y          0x000d003e
+#define HID_DG_TWIST           0x000d0041
 #define HID_DG_TIPSWITCH       0x000d0042
 #define HID_DG_TIPSWITCH2      0x000d0043
 #define HID_DG_BARRELSWITCH    0x000d0044
@@ -479,6 +483,7 @@ struct hid_input {
        struct list_head list;
        struct hid_report *report;
        struct input_dev *input;
+       bool registered;
 };
 
 enum hid_type {