diff options
| author | Sean Paul <seanpaul@chromium.org> | 2017-06-27 11:36:28 -0400 |
|---|---|---|
| committer | Sean Paul <seanpaul@chromium.org> | 2017-06-27 11:36:28 -0400 |
| commit | c048c984de38d906bb0df56ec2ae90eafc123d0a (patch) | |
| tree | 4e670e712aeedcaf2e2193b64f9120e03320e01c /drivers/hid/hid-ids.h | |
| parent | 38cb266ad1a24e037220dc563ab46364595b17b6 (diff) | |
| parent | 6d61e70ccc21606ffb8a0a03bd3aba24f659502b (diff) | |
| download | op-kernel-dev-c048c984de38d906bb0df56ec2ae90eafc123d0a.zip op-kernel-dev-c048c984de38d906bb0df56ec2ae90eafc123d0a.tar.gz | |
Merge remote-tracking branch 'airlied/drm-next' into drm-misc-next-fixes
Backmerge drm-next with rc7
Diffstat (limited to 'drivers/hid/hid-ids.h')
| -rw-r--r-- | drivers/hid/hid-ids.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index 8ca1e8c..4f9a393 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h @@ -319,6 +319,9 @@ #define USB_VENDOR_ID_DELCOM 0x0fc5 #define USB_DEVICE_ID_DELCOM_VISUAL_IND 0xb080 +#define USB_VENDOR_ID_DELL 0x413c +#define USB_DEVICE_ID_DELL_PIXART_USB_OPTICAL_MOUSE 0x301a + #define USB_VENDOR_ID_DELORME 0x1163 #define USB_DEVICE_ID_DELORME_EARTHMATE 0x0100 #define USB_DEVICE_ID_DELORME_EM_LT20 0x0200 |
