| From 2d8767bb421574dfcf48e4be0751ce7d8f73d5d7 Mon Sep 17 00:00:00 2001 |
| From: Cyrus Lien <cyrus.lien@canonical.com> |
| Date: Mon, 23 Jul 2012 17:11:51 +0800 |
| Subject: HID: add ASUS AIO keyboard model AK1D |
| |
| From: Cyrus Lien <cyrus.lien@canonical.com> |
| |
| commit 2d8767bb421574dfcf48e4be0751ce7d8f73d5d7 upstream. |
| |
| Add Asus All-In-One PC keyboard model AK1D. |
| |
| BugLink: https://bugs.launchpad.net/bugs/1027789 |
| |
| Signed-off-by: Cyrus Lien <cyrus.lien@canonical.com> |
| Signed-off-by: Jiri Kosina <jkosina@suse.cz> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/hid/hid-chicony.c | 1 + |
| drivers/hid/hid-core.c | 1 + |
| drivers/hid/hid-ids.h | 1 + |
| 3 files changed, 3 insertions(+) |
| |
| --- a/drivers/hid/hid-chicony.c |
| +++ b/drivers/hid/hid-chicony.c |
| @@ -60,6 +60,7 @@ static int ch_input_mapping(struct hid_d |
| static const struct hid_device_id ch_devices[] = { |
| { HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_TACTICAL_PAD) }, |
| { HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_WIRELESS2) }, |
| + { HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_AK1D) }, |
| { } |
| }; |
| MODULE_DEVICE_TABLE(hid, ch_devices); |
| --- a/drivers/hid/hid-core.c |
| +++ b/drivers/hid/hid-core.c |
| @@ -1521,6 +1521,7 @@ static const struct hid_device_id hid_ha |
| { HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_TACTICAL_PAD) }, |
| { HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_WIRELESS) }, |
| { HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_WIRELESS2) }, |
| + { HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_AK1D) }, |
| { HID_USB_DEVICE(USB_VENDOR_ID_CREATIVELABS, USB_DEVICE_ID_PRODIKEYS_PCMIDI) }, |
| { HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_1) }, |
| { HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_2) }, |
| --- a/drivers/hid/hid-ids.h |
| +++ b/drivers/hid/hid-ids.h |
| @@ -208,6 +208,7 @@ |
| #define USB_DEVICE_ID_CHICONY_MULTI_TOUCH 0xb19d |
| #define USB_DEVICE_ID_CHICONY_WIRELESS 0x0618 |
| #define USB_DEVICE_ID_CHICONY_WIRELESS2 0x1123 |
| +#define USB_DEVICE_ID_CHICONY_AK1D 0x1125 |
| |
| #define USB_VENDOR_ID_CHUNGHWAT 0x2247 |
| #define USB_DEVICE_ID_CHUNGHWAT_MULTITOUCH 0x0001 |
