diff options
| author |   Jiri Kosina <jkosina@suse.cz> | 2020-10-15 20:35:46 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2020-10-15 20:35:46 +0200 |
| commit | cc51d171776f3a6acb6828bad0b780a4cacf5423 (patch) | |
| tree | ebe3a67b01e083046dcb9c109bafb2ad0a163494 /drivers/hid | |
| parent | HID: core: Sanitize event code and type when mapping input (diff) | |
| parent | HID: apple: Add support for Matias wireless keyboard (diff) | |
| download | linux-dev-cc51d171776f3a6acb6828bad0b780a4cacf5423.tar.xz linux-dev-cc51d171776f3a6acb6828bad0b780a4cacf5423.zip | |
Merge branch 'for-5.10/apple' into for-linus
- support for Matias wireless (identifies itself as ISO RevB Alu)
Diffstat (limited to 'drivers/hid')
| -rw-r--r-- | drivers/hid/hid-apple.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/hid/hid-apple.c b/drivers/hid/hid-apple.c index e82f604d33e9..6b8f0d004d34 100644 --- a/drivers/hid/hid-apple.c +++ b/drivers/hid/hid-apple.c @@ -503,6 +503,8 @@ static const struct hid_device_id apple_devices[] = { .driver_data = APPLE_HAS_FN }, { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_REVB_ISO), .driver_data = APPLE_HAS_FN }, + { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_REVB_ISO), + .driver_data = APPLE_HAS_FN }, { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_REVB_JIS), .driver_data = APPLE_HAS_FN }, { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_ANSI), |