diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2018-10-23 13:36:05 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2018-10-23 13:36:05 +0200 |
| commit | 5099bc83ba11ff38a530ebebed678f23877a2b2d (patch) | |
| tree | cbc7d1c44a7c6b975121d8f2b57b6e806d05f013 /drivers/hid/hid-ids.h | |
| parent | 276e722761a1c7903fbfb065420fd1850b00f1dd (diff) | |
| parent | 830e82aa48f32518dfa5335c0134f611d4bab4b2 (diff) | |
Merge branch 'for-4.20/microsoft' into for-linus
Rumble support for Xbox One S
Diffstat (limited to 'drivers/hid/hid-ids.h')
| -rw-r--r-- | drivers/hid/hid-ids.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index c5233389836b..f63489c882bb 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h @@ -804,6 +804,7 @@ #define USB_DEVICE_ID_MS_TOUCH_COVER_2 0x07a7 #define USB_DEVICE_ID_MS_TYPE_COVER_2 0x07a9 #define USB_DEVICE_ID_MS_POWER_COVER 0x07da +#define USB_DEVICE_ID_MS_XBOX_ONE_S_CONTROLLER 0x02fd #define USB_VENDOR_ID_MOJO 0x8282 #define USB_DEVICE_ID_RETRO_ADAPTER 0x3201 |