diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2020-12-16 11:42:47 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2020-12-16 11:42:47 +0100 |
| commit | 4d3d3d70cc9072acb2e643102421923ef90fdd97 (patch) | |
| tree | 7b455f84b87ffbfbac63d7bdeb5ed4f12f06cdc1 /drivers/hid/hid-ids.h | |
| parent | 47cdd7f139dc3e896a627e8c0e98d0501555a889 (diff) | |
| parent | cc894ac553605c9193a7a94372ff2f8af5766f46 (diff) | |
Merge branch 'for-5.11/sony' into for-linus
- DS4 power and firmware reporting fixes, from Roderick Colenbrander
- support for ghlive PS3/WII u dongles, from Pascal Giard
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 a4a8497207cb..4c5f23640f9c 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h @@ -1077,6 +1077,9 @@ #define USB_DEVICE_ID_SONY_BUZZ_CONTROLLER 0x0002 #define USB_DEVICE_ID_SONY_WIRELESS_BUZZ_CONTROLLER 0x1000 +#define USB_VENDOR_ID_SONY_GHLIVE 0x12ba +#define USB_DEVICE_ID_SONY_PS3WIIU_GHLIVE_DONGLE 0x074b + #define USB_VENDOR_ID_SINO_LITE 0x1345 #define USB_DEVICE_ID_SINO_LITE_CONTROLLER 0x3008 |