diff options
author | J. Bruce Fields <bfields@redhat.com> | 2017-02-20 12:24:00 -0500 |
---|---|---|
committer | J. Bruce Fields <bfields@redhat.com> | 2017-02-20 17:20:05 -0500 |
commit | 60709c093ed39aadb0f09972ebbc96dc34eb372e (patch) | |
tree | 983681311986070971d3756d9f8e75868aa7bb9a /drivers/hid/hid-ids.h | |
parent | 7323f0d2881bbd426ce6bc0a956ef9e739ffe767 (diff) | |
parent | 0839ffb83e44e5ff1843e932592525fc2bff23ff (diff) | |
download | linux-60709c093ed39aadb0f09972ebbc96dc34eb372e.tar.bz2 |
nfsd: merge stable fix into main nfsd branch
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 f46f2c5117fa..350accfee8e8 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h @@ -76,6 +76,9 @@ #define USB_VENDOR_ID_ALPS_JP 0x044E #define HID_DEVICE_ID_ALPS_U1_DUAL 0x120B +#define USB_VENDOR_ID_AMI 0x046b +#define USB_DEVICE_ID_AMI_VIRT_KEYBOARD_AND_MOUSE 0xff10 + #define USB_VENDOR_ID_ANTON 0x1130 #define USB_DEVICE_ID_ANTON_TOUCH_PAD 0x3101 |