diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2021-04-29 21:46:05 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2021-04-29 21:46:05 +0200 |
| commit | 5a4a13cb47121dd20812e3397d30fd410ebd9f7d (patch) | |
| tree | a3f03eb877086c4f3245983489b467c6d47a8a3c /drivers/hid/hid-quirks.c | |
| parent | e50fedec822efc7b7090f95862b782d91ca8aec0 (diff) | |
| parent | e9bb37ff35bb6faed53c5a2ae0329589a8b02939 (diff) | |
Merge branch 'for-5.13/thrustmaster' into for-linus
- support for initialization of some newer Thrustmaster wheels from
Dario Pagani
Diffstat (limited to 'drivers/hid/hid-quirks.c')
| -rw-r--r-- | drivers/hid/hid-quirks.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/hid/hid-quirks.c b/drivers/hid/hid-quirks.c index 3816be700f49..3dd6f15f2a67 100644 --- a/drivers/hid/hid-quirks.c +++ b/drivers/hid/hid-quirks.c @@ -659,6 +659,9 @@ static const struct hid_device_id hid_have_special_driver[] = { { HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb654) }, { HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb65a) }, #endif +#if IS_ENABLED(CONFIG_HID_TMINIT) + { HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb65d) }, +#endif #if IS_ENABLED(CONFIG_HID_TIVO) { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_TIVO, USB_DEVICE_ID_TIVO_SLIDE_BT) }, { HID_USB_DEVICE(USB_VENDOR_ID_TIVO, USB_DEVICE_ID_TIVO_SLIDE) }, |