aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/hid/hid-apple.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/hid/hid-apple.c b/drivers/hid/hid-apple.c
index f0b177844cf8..a808e57f23a3 100644
--- a/drivers/hid/hid-apple.c
+++ b/drivers/hid/hid-apple.c
@@ -387,7 +387,7 @@ static const struct hid_device_id apple_devices[] = {
387 APPLE_IGNORE_MOUSE | APPLE_ISO_KEYBOARD }, 387 APPLE_IGNORE_MOUSE | APPLE_ISO_KEYBOARD },
388 { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER3_JIS), 388 { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER3_JIS),
389 .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN | 389 .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |
390 APPLE_IGNORE_MOUSE }, 390 APPLE_IGNORE_MOUSE | APPLE_RDESC_JIS },
391 { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_ANSI), 391 { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_ANSI),
392 .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN | 392 .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |
393 APPLE_IGNORE_MOUSE }, 393 APPLE_IGNORE_MOUSE },
@@ -411,7 +411,7 @@ static const struct hid_device_id apple_devices[] = {
411 APPLE_IGNORE_MOUSE }, 411 APPLE_IGNORE_MOUSE },
412 { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_HF_JIS), 412 { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_HF_JIS),
413 .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN | 413 .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |
414 APPLE_IGNORE_MOUSE }, 414 APPLE_IGNORE_MOUSE | APPLE_RDESC_JIS },
415 { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_ANSI), 415 { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_ANSI),
416 .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN }, 416 .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },
417 { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_ISO), 417 { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_ISO),
@@ -425,14 +425,14 @@ static const struct hid_device_id apple_devices[] = {
425 .driver_data = APPLE_HAS_FN | APPLE_ISO_KEYBOARD | 425 .driver_data = APPLE_HAS_FN | APPLE_ISO_KEYBOARD |
426 APPLE_IGNORE_MOUSE }, 426 APPLE_IGNORE_MOUSE },
427 { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_JIS), 427 { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_JIS),
428 .driver_data = APPLE_HAS_FN | APPLE_IGNORE_MOUSE }, 428 .driver_data = APPLE_HAS_FN | APPLE_IGNORE_MOUSE | APPLE_RDESC_JIS },
429 { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_ANSI), 429 { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_ANSI),
430 .driver_data = APPLE_HAS_FN | APPLE_IGNORE_MOUSE }, 430 .driver_data = APPLE_HAS_FN | APPLE_IGNORE_MOUSE },
431 { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_ISO), 431 { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_ISO),
432 .driver_data = APPLE_HAS_FN | APPLE_ISO_KEYBOARD | 432 .driver_data = APPLE_HAS_FN | APPLE_ISO_KEYBOARD |
433 APPLE_IGNORE_MOUSE }, 433 APPLE_IGNORE_MOUSE },
434 { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_JIS), 434 { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_JIS),
435 .driver_data = APPLE_HAS_FN | APPLE_IGNORE_MOUSE }, 435 .driver_data = APPLE_HAS_FN | APPLE_IGNORE_MOUSE | APPLE_RDESC_JIS },
436 { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY), 436 { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY),
437 .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN | 437 .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |
438 APPLE_IGNORE_MOUSE }, 438 APPLE_IGNORE_MOUSE },