diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2011-08-24 16:41:52 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2011-08-24 16:41:52 +0200 |
| commit | d446014162ed2ce1c5181b52c6d5f7492acbdade (patch) | |
| tree | 6d0536b8c0cc3210ca672efdfb1d17f646b119f6 /drivers/hid/hid-apple.c | |
| parent | c87019e41d61f3f972bd2f6a2380fc9896e4ab74 (diff) | |
| parent | f5e4282586dc0c9dab8c7d32e6c43aa07f68586b (diff) | |
| download | op-kernel-dev-d446014162ed2ce1c5181b52c6d5f7492acbdade.zip op-kernel-dev-d446014162ed2ce1c5181b52c6d5f7492acbdade.tar.gz | |
Merge branches 'wiimote' and 'upstream-fixes' into for-linus
Diffstat (limited to 'drivers/hid/hid-apple.c')
| -rw-r--r-- | drivers/hid/hid-apple.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/hid/hid-apple.c b/drivers/hid/hid-apple.c index b85744f..18b3bc6 100644 --- a/drivers/hid/hid-apple.c +++ b/drivers/hid/hid-apple.c @@ -444,6 +444,12 @@ static const struct hid_device_id apple_devices[] = { { 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 }, + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_REVB_ANSI), + .driver_data = APPLE_HAS_FN }, + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_REVB_ISO), + .driver_data = APPLE_HAS_FN | APPLE_ISO_KEYBOARD }, + { 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), .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN }, { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_ISO), |
