summaryrefslogtreecommitdiffstats
path: root/drivers/hid/hid-quirks.c
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2022-01-10 09:54:31 +0100
committerJiri Kosina <jkosina@suse.cz>2022-01-10 09:54:31 +0100
commitfce0d275843712db6f9b611856f539da29ad5529 (patch)
tree794bb59ac589cc9c19d0d37dacc2c4b4847605e0 /drivers/hid/hid-quirks.c
parent8a2094d679d921d104d3296528d4fa419702ce1c (diff)
parent7f84e2439ed2e2c7afdced9564dda1220e932704 (diff)
downloadlinux-stable-fce0d275843712db6f9b611856f539da29ad5529.tar.gz
linux-stable-fce0d275843712db6f9b611856f539da29ad5529.tar.bz2
linux-stable-fce0d275843712db6f9b611856f539da29ad5529.zip
Merge branch 'for-5.17/apple' into for-linus
- Apple Magic Keyboard support improvements (José Expósito, Alex Henrie, Benjamin Berg)
Diffstat (limited to 'drivers/hid/hid-quirks.c')
-rw-r--r--drivers/hid/hid-quirks.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/hid/hid-quirks.c b/drivers/hid/hid-quirks.c
index ee7e504e7279..9af1dc8ae3a2 100644
--- a/drivers/hid/hid-quirks.c
+++ b/drivers/hid/hid-quirks.c
@@ -304,6 +304,7 @@ static const struct hid_device_id hid_have_special_driver[] = {
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY) },
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY) },
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_2021) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_FINGERPRINT_2021) },
#endif
#if IS_ENABLED(CONFIG_HID_APPLEIR)
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_IRCONTROL) },