From 3981a16c935ce397e1e7e310fd97802cba0e2bbe Mon Sep 17 00:00:00 2001 From: Johannes Thumshirn Date: Sat, 3 Nov 2012 10:43:31 +0100 Subject: [PATCH] --- yaml --- r: 343106 b: refs/heads/master c: 537b6643dcb0ff7f47b21debd7bc3346b1456a44 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/hid/hid-apple.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 79d585d749c8..3eec2d3dbf52 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f8e86d054686d9090549476ea2394aa04c614a93 +refs/heads/master: 537b6643dcb0ff7f47b21debd7bc3346b1456a44 diff --git a/trunk/drivers/hid/hid-apple.c b/trunk/drivers/hid/hid-apple.c index 06ebdbb6ea02..5df5e20178a6 100644 --- a/trunk/drivers/hid/hid-apple.c +++ b/trunk/drivers/hid/hid-apple.c @@ -439,7 +439,8 @@ static const struct hid_device_id apple_devices[] = { { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_HF_ANSI), .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN }, { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_HF_ISO), - .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN }, + .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN | + APPLE_ISO_KEYBOARD }, { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_HF_JIS), .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN | APPLE_RDESC_JIS },