Merge branches 'for-4.10/asus', 'for-4.10/cp2112', 'for-4.10/i2c-hid-nopower', 'for-4.10/intel-ish', 'for-4.10/mayflash', 'for-4.10/microsoft-surface-3', 'for-4.10/multitouch', 'for-4.10/sony', 'for-4.10/udraw-ps3', 'for-4.10/upstream' and 'for-4.10/wacom/generic' into for-linus
This commit is contained in:

@@ -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 {
|
||||
|
Reference in New Issue
Block a user