diff options
author | Jiri Kosina | 2017-06-20 10:52:46 +0200 |
---|---|---|
committer | Jiri Kosina | 2017-06-20 10:52:46 +0200 |
commit | 900a88ef348803cd2ad2aeb13ffe06e807c6ce65 (patch) | |
tree | 029a287c2d0e8cac2f4c33f7bde37ab981cd3cd8 /drivers/hid/hid-ids.h | |
parent | HID: let generic driver yield control iff specific driver has been enabled (diff) | |
parent | Revert "HID: magicmouse: Set multi-touch keybits for Magic Mouse" (diff) | |
download | kernel-qcow2-linux-900a88ef348803cd2ad2aeb13ffe06e807c6ce65.tar.gz kernel-qcow2-linux-900a88ef348803cd2ad2aeb13ffe06e807c6ce65.tar.xz kernel-qcow2-linux-900a88ef348803cd2ad2aeb13ffe06e807c6ce65.zip |
Merge branch 'for-4.12/upstream-fixes' into for-linus
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 8ca1e8ce0af2..4f9a3938189a 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 |