diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-03-10 08:12:46 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-03-10 08:12:46 +0100 |
commit | 8e567ed9e244f6af2ecfd22a7204612ec361d334 (patch) | |
tree | bf558612f56dcdd862ead3fefd1aa5abaac15688 /drivers/hid/hid-ite.c | |
parent | 6701adfa9693bd20b89f2cce57754ced2c18ed3b (diff) | |
parent | 2c523b344dfa65a3738e7039832044aa133c75fb (diff) |
Merge 5.6-rc5 into usb-next
We need the USB fixes in here as well.
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 | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/hid/hid-ite.c b/drivers/hid/hid-ite.c index c436e12feb23..6c55682c5974 100644 --- a/drivers/hid/hid-ite.c +++ b/drivers/hid/hid-ite.c @@ -41,8 +41,9 @@ static const struct hid_device_id ite_devices[] = { { HID_USB_DEVICE(USB_VENDOR_ID_ITE, USB_DEVICE_ID_ITE8595) }, { HID_USB_DEVICE(USB_VENDOR_ID_258A, USB_DEVICE_ID_258A_6A88) }, /* ITE8595 USB kbd ctlr, with Synaptics touchpad connected to it. */ - { HID_USB_DEVICE(USB_VENDOR_ID_SYNAPTICS, - USB_DEVICE_ID_SYNAPTICS_ACER_SWITCH5_012) }, + { HID_DEVICE(BUS_USB, HID_GROUP_GENERIC, + USB_VENDOR_ID_SYNAPTICS, + USB_DEVICE_ID_SYNAPTICS_ACER_SWITCH5_012) }, { } }; MODULE_DEVICE_TABLE(hid, ite_devices); |