aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/hid/hid-ids.h
diff options
context:
space:
mode:
authorKeng-Yu Lin <kengyu@canonical.com>2012-02-02 10:31:26 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-04-02 09:52:48 -0700
commitc2040a53ad769fd0f12678feaf73ffa1d4ff124d (patch)
treedf5067de57c025ed2343d80976e6d92339283a81 /drivers/hid/hid-ids.h
parentef5cf6b5cfaac10c6ad1cb6547c977efcddce7db (diff)
downloadkernel_samsung_smdk4412-c2040a53ad769fd0f12678feaf73ffa1d4ff124d.zip
kernel_samsung_smdk4412-c2040a53ad769fd0f12678feaf73ffa1d4ff124d.tar.gz
kernel_samsung_smdk4412-c2040a53ad769fd0f12678feaf73ffa1d4ff124d.tar.bz2
HID: add extra hotkeys in Asus AIO keyboards
commit 3596bb929f2abd3433c2eaa5755fad48ac207af1 upstream. The Asus All-In-One PC has a wireless keyboard with wifi toggle, brightness up, brightness down and display off hotkeys. This patch adds suppoort for these hotkeys. Signed-off-by: Keng-Yu Lin <kengyu@canonical.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/hid/hid-ids.h')
-rw-r--r--drivers/hid/hid-ids.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index 3c3daec..fba3fc4 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -192,6 +192,7 @@
#define USB_DEVICE_ID_CHICONY_TACTICAL_PAD 0x0418
#define USB_DEVICE_ID_CHICONY_MULTI_TOUCH 0xb19d
#define USB_DEVICE_ID_CHICONY_WIRELESS 0x0618
+#define USB_DEVICE_ID_CHICONY_WIRELESS2 0x1123
#define USB_VENDOR_ID_CHUNGHWAT 0x2247
#define USB_DEVICE_ID_CHUNGHWAT_MULTITOUCH 0x0001