summaryrefslogtreecommitdiffstats
path: root/drivers/hid/hid-ids.h
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2021-02-23 11:31:58 +0100
committerJiri Kosina <jkosina@suse.cz>2021-02-23 11:31:58 +0100
commitfcd89e77db4969a04736eef0e15ee31cc82d6ca1 (patch)
treea0769d8200c607e3707dd45278251f8c54a49671 /drivers/hid/hid-ids.h
parent760f7e7b959580ee06d925ad737147a36b194e83 (diff)
parent859b510bb7fa5797cfaf7bf5729336bf0e94dd2e (diff)
downloadlinux-fcd89e77db4969a04736eef0e15ee31cc82d6ca1.tar.bz2
Merge branch 'for-5.12/chicony' into for-linus
- KEY_RFKILL support for Chicony devices from Jian-Hong Pan
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 5db0735c8438..abe6503ce5a6 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -270,6 +270,7 @@
#define USB_DEVICE_ID_CHICONY_PIXART_USB_OPTICAL_MOUSE 0x1053
#define USB_DEVICE_ID_CHICONY_PIXART_USB_OPTICAL_MOUSE2 0x0939
#define USB_DEVICE_ID_CHICONY_WIRELESS2 0x1123
+#define USB_DEVICE_ID_CHICONY_WIRELESS3 0x1236
#define USB_DEVICE_ID_ASUS_AK1D 0x1125
#define USB_DEVICE_ID_CHICONY_TOSHIBA_WT10A 0x1408
#define USB_DEVICE_ID_CHICONY_ACER_SWITCH12 0x1421