diff options
| author | Joshua V. Dillon <jvdillon@gmail.com> | 2011-08-10 12:04:28 -0700 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2011-11-16 14:46:51 -0700 |
| commit | 293b77e2bacba9065dc0aac0e89d8928229f9f36 (patch) | |
| tree | 0d46c347d4bedddde30c653562c800403c81fa83 /drivers | |
| parent | a244c26e2413414ea70e8bc5901eec76e536f58c (diff) | |
UBUNTU: SAUCE: HID: add support for MacBookAir4,2 keyboard.
Added USB device IDs for MacBookAir4,2 keyboard. Device constants were
copied from the MacBookAir3,2 constants. The 4,2 device specification is
reportedly unchanged from the 3,2 predecessor and seems to work well.
This patch has been accepted upstream and should land in 3.1.0. Without
this support, the "fn" key on the keyboards does not work properly,
among other possible issues.
Signed-off-by: Joshua V Dillon <jvdillon@gmail.com>
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/hid/hid-apple.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/hid/hid-apple.c b/drivers/hid/hid-apple.c index 299d2387112..8cdb4b45b30 100644 --- a/drivers/hid/hid-apple.c +++ b/drivers/hid/hid-apple.c @@ -183,6 +183,9 @@ static int hidinput_apple_event(struct hid_device *hid, struct input_dev *input, if (hid->product >= USB_DEVICE_ID_APPLE_WELLSPRING4_ANSI && hid->product <= USB_DEVICE_ID_APPLE_WELLSPRING4A_JIS) table = macbookair_fn_keys; + else if (hid->product >= USB_DEVICE_ID_APPLE_WELLSPRING6_ANSI && + hid->product <= USB_DEVICE_ID_APPLE_WELLSPRING6_JIS) + table = macbookair_fn_keys; else if (hid->product < 0x21d || hid->product >= 0x300) table = powerbook_fn_keys; else |