diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2021-02-23 11:43:27 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2021-02-23 11:43:27 +0100 |
| commit | 00522de2f9f184946d5c4384100f48270f88c45d (patch) | |
| tree | 6b0d16151c7a37740f1a0b5c3963a1506b9a9994 /drivers/hid/hid-quirks.c | |
| parent | c35f31fc066c8f43bfcd74aab9ffbc454a5b9336 (diff) | |
| parent | f7271b2a697d2549db7aa60e0a8e0afeb852faa5 (diff) | |
Merge branch 'for-5.12/uclogic' into for-linus
- Trust Panora support improvements from Cristian Klein
Diffstat (limited to 'drivers/hid/hid-quirks.c')
| -rw-r--r-- | drivers/hid/hid-quirks.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/hid/hid-quirks.c b/drivers/hid/hid-quirks.c index 15db7522b41e..1a9daf03dbfa 100644 --- a/drivers/hid/hid-quirks.c +++ b/drivers/hid/hid-quirks.c @@ -180,7 +180,6 @@ static const struct hid_device_id hid_quirks[] = { { HID_USB_DEVICE(USB_VENDOR_ID_TOUCHPACK, USB_DEVICE_ID_TOUCHPACK_RTS), HID_QUIRK_MULTI_INPUT }, { HID_USB_DEVICE(USB_VENDOR_ID_TPV, USB_DEVICE_ID_TPV_OPTICAL_TOUCHSCREEN_8882), HID_QUIRK_NOGET }, { HID_USB_DEVICE(USB_VENDOR_ID_TPV, USB_DEVICE_ID_TPV_OPTICAL_TOUCHSCREEN_8883), HID_QUIRK_NOGET }, - { HID_USB_DEVICE(USB_VENDOR_ID_TRUST, USB_DEVICE_ID_TRUST_PANORA_TABLET), HID_QUIRK_MULTI_INPUT | HID_QUIRK_HIDINPUT_FORCE }, { HID_USB_DEVICE(USB_VENDOR_ID_TURBOX, USB_DEVICE_ID_TURBOX_KEYBOARD), HID_QUIRK_NOGET }, { HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UCLOGIC_TABLET_KNA5), HID_QUIRK_MULTI_INPUT }, { HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UCLOGIC_TABLET_TWA60), HID_QUIRK_MULTI_INPUT }, |