diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-12-21 10:46:08 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-12-21 10:46:08 -0500 |
commit | cd6a22310ec2a70092e136d0cd65bb77c1502521 (patch) | |
tree | c01fa788b27b240c7b426d7f329d92bd58c7b8f5 /drivers/hid/hid-ite.c | |
parent | 1e12a521d6917004f8b95a3b5864b92edc2694c8 (diff) | |
parent | 177c459b08a34dcf004aa9a4c1f1d8be682ff3af (diff) |
Merge USB 4.20-rc8 mergepoint into usb-next
We need the USB changes in here for additional patches to be able to
apply cleanly.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/hid/hid-ite.c')
-rw-r--r-- | drivers/hid/hid-ite.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/hid/hid-ite.c b/drivers/hid/hid-ite.c index 1882a4ab0f29..98b059d79bc8 100644 --- a/drivers/hid/hid-ite.c +++ b/drivers/hid/hid-ite.c | |||
@@ -42,6 +42,7 @@ static int ite_event(struct hid_device *hdev, struct hid_field *field, | |||
42 | 42 | ||
43 | static const struct hid_device_id ite_devices[] = { | 43 | static const struct hid_device_id ite_devices[] = { |
44 | { HID_USB_DEVICE(USB_VENDOR_ID_ITE, USB_DEVICE_ID_ITE8595) }, | 44 | { HID_USB_DEVICE(USB_VENDOR_ID_ITE, USB_DEVICE_ID_ITE8595) }, |
45 | { HID_USB_DEVICE(USB_VENDOR_ID_258A, USB_DEVICE_ID_258A_6A88) }, | ||
45 | { } | 46 | { } |
46 | }; | 47 | }; |
47 | MODULE_DEVICE_TABLE(hid, ite_devices); | 48 | MODULE_DEVICE_TABLE(hid, ite_devices); |