diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2018-04-05 13:16:52 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2018-04-05 13:16:52 +0200 |
| commit | d463fd44c4d620b6f96f9f56474fbd42cb663a84 (patch) | |
| tree | 2aaf04cc5c5f529c69ab29e3d3e4558a3968baea /drivers/hid/hid-ids.h | |
| parent | a9ef00aec7633b3be3b19a7fce9a8d13f5a07c1c (diff) | |
| parent | 7d3d88401fb75081e731d62c1c79584413525aa6 (diff) | |
Merge branch 'for-4.17/google-hammer' into for-linus
Support for Google Hammer device.
Diffstat (limited to 'drivers/hid/hid-ids.h')
| -rw-r--r-- | drivers/hid/hid-ids.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index 3fdd101119ec..9b5fb2f42bc7 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h @@ -447,7 +447,10 @@ #define USB_DEVICE_ID_GOODTOUCH_000f 0x000f #define USB_VENDOR_ID_GOOGLE 0x18d1 +#define USB_DEVICE_ID_GOOGLE_HAMMER 0x5022 #define USB_DEVICE_ID_GOOGLE_TOUCH_ROSE 0x5028 +#define USB_DEVICE_ID_GOOGLE_STAFF 0x502b +#define USB_DEVICE_ID_GOOGLE_WAND 0x502d #define USB_VENDOR_ID_GOTOP 0x08f2 #define USB_DEVICE_ID_SUPER_Q2 0x007f |