diff options
| author |   Jiri Kosina <jkosina@suse.cz> | 2015-09-01 15:38:33 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2015-09-01 15:38:33 +0200 |
| commit | f212bd95a9f62b7929c59b16e1d3bbde2fb4081d (patch) | |
| tree | 62bf85b58c0e108b3c5597bfb5d492efd8322726 /drivers/hid/hid-ids.h | |
| parent | Merge branches 'for-4.3/chicony', 'for-4.3/cp2112', 'for-4.3/i2c-hid', 'for-4.3/lenovo', 'for-4.3/logitech', 'for-4.3/multitouch', 'for-4.3/picolcd', 'for-4.3/rmi', 'for-4.3/sensor-hub', 'for-4.3/sony' and 'for-4.3/wacom' into for-linus (diff) | |
| parent | HID: microsoft: Add Surface 3 type cover (diff) | |
| download | linux-dev-f212bd95a9f62b7929c59b16e1d3bbde2fb4081d.tar.xz linux-dev-f212bd95a9f62b7929c59b16e1d3bbde2fb4081d.zip | |
Merge branch 'for-4.3/microsoft' into for-linus
Conflicts:
drivers/hid/usbhid/hid-quirks.c
Diffstat (limited to 'drivers/hid/hid-ids.h')
| -rw-r--r-- | drivers/hid/hid-ids.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index 814f76fdc7da..f769208276ae 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h @@ -678,8 +678,9 @@ #define USB_DEVICE_ID_MS_SURFACE_PRO_2 0x0799 #define USB_DEVICE_ID_MS_TOUCH_COVER_2 0x07a7 #define USB_DEVICE_ID_MS_TYPE_COVER_2 0x07a9 -#define USB_DEVICE_ID_MS_TYPE_COVER_3 0x07dc -#define USB_DEVICE_ID_MS_TYPE_COVER_3_JP 0x07dd +#define USB_DEVICE_ID_MS_TYPE_COVER_PRO_3 0x07dc +#define USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_JP 0x07dd +#define USB_DEVICE_ID_MS_TYPE_COVER_3 0x07de #define USB_DEVICE_ID_MS_POWER_COVER 0x07da #define USB_VENDOR_ID_MOJO 0x8282 |