summaryrefslogtreecommitdiffstats
path: root/drivers/hid/hid-ids.h
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2015-09-01 15:38:33 +0200
committerJiri Kosina <jkosina@suse.cz>2015-09-01 15:38:33 +0200
commitf212bd95a9f62b7929c59b16e1d3bbde2fb4081d (patch)
tree62bf85b58c0e108b3c5597bfb5d492efd8322726 /drivers/hid/hid-ids.h
parent8c4de9bc2041229fb778e0c47e32585b6f6b1d09 (diff)
parent0439de75d32c249bd9f5824ffd5e40c4c2109d77 (diff)
downloadlinux-f212bd95a9f62b7929c59b16e1d3bbde2fb4081d.tar.bz2
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.h5
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