diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-04-10 09:21:55 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-04-10 09:21:55 -0400 |
| commit | f78a8236c6502760705399dfa42e22ab11aa1e6b (patch) | |
| tree | d965f09daff0d531c63e35c764e7061f9c43afe7 /drivers/hid/hid-ids.h | |
| parent | 6cb3d05f3030deed157c9bbada5c58e7ee0f5172 (diff) | |
| parent | 39da7c509acff13fc8cb12ec1bb20337c988ed36 (diff) | |
Merge 4.11-rc6 into staging-next
We want the staging and iio fixes in here to handle merging easier.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/hid/hid-ids.h')
| -rw-r--r-- | drivers/hid/hid-ids.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index 0e2e7c571d22..4e2648c86c8c 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h | |||
| @@ -1082,6 +1082,7 @@ | |||
| 1082 | 1082 | ||
| 1083 | #define USB_VENDOR_ID_XIN_MO 0x16c0 | 1083 | #define USB_VENDOR_ID_XIN_MO 0x16c0 |
| 1084 | #define USB_DEVICE_ID_XIN_MO_DUAL_ARCADE 0x05e1 | 1084 | #define USB_DEVICE_ID_XIN_MO_DUAL_ARCADE 0x05e1 |
| 1085 | #define USB_DEVICE_ID_THT_2P_ARCADE 0x75e1 | ||
| 1085 | 1086 | ||
| 1086 | #define USB_VENDOR_ID_XIROKU 0x1477 | 1087 | #define USB_VENDOR_ID_XIROKU 0x1477 |
| 1087 | #define USB_DEVICE_ID_XIROKU_SPX 0x1006 | 1088 | #define USB_DEVICE_ID_XIROKU_SPX 0x1006 |