Commit cc51d171 authored by Jiri Kosina's avatar Jiri Kosina
Browse files

Merge branch 'for-5.10/apple' into for-linus 

- support for Matias wireless (identifies itself as ISO RevB Alu)
parents 35556bed 4c945426

drivers/hid/hid-apple.c

+2 −0
Original line number Diff line number Diff line
@@ -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),

CRA Git | Maintained and supported by SUSTech CRA and CCSE