diff options
author | Jiri Kosina <jkosina@suse.cz> | 2021-09-01 23:03:18 +0300 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2021-09-01 23:03:18 +0300 |
commit | 854a95877f4d95b65918cb126fdc0c84ea564676 (patch) | |
tree | 5e9fffcc1a4a92916c8c26ba6efafa56f394c7b2 /drivers/hid/hid-ids.h | |
parent | 163a3124667901c29978bf67c0ffdcc9650515ac (diff) | |
parent | a4bfe13f96bf8b1b2f233d16e960a3e0680d67fb (diff) | |
download | linux-854a95877f4d95b65918cb126fdc0c84ea564676.tar.xz |
Merge branch 'for-5.15/sony' into for-linus
- Support for GHLive PS4 dongles
Diffstat (limited to 'drivers/hid/hid-ids.h')
-rw-r--r-- | drivers/hid/hid-ids.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index c3997afecbc9..29564b370341 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h @@ -41,9 +41,6 @@ #define USB_VENDOR_ID_ACTIONSTAR 0x2101 #define USB_DEVICE_ID_ACTIONSTAR_1011 0x1011 -#define USB_VENDOR_ID_ACTIVISION 0x1430 -#define USB_DEVICE_ID_ACTIVISION_GUITAR_DONGLE 0x474c - #define USB_VENDOR_ID_ADS_TECH 0x06e1 #define USB_DEVICE_ID_ADS_TECH_RADIO_SI470X 0xa155 @@ -1020,6 +1017,10 @@ #define USB_VENDOR_ID_REALTEK 0x0bda #define USB_DEVICE_ID_REALTEK_READER 0x0152 +#define USB_VENDOR_ID_REDOCTANE 0x1430 +#define USB_DEVICE_ID_REDOCTANE_GUITAR_DONGLE 0x474c +#define USB_DEVICE_ID_REDOCTANE_PS4_GHLIVE_DONGLE 0x07bb + #define USB_VENDOR_ID_RETROUSB 0xf000 #define USB_DEVICE_ID_RETROUSB_SNES_RETROPAD 0x0003 #define USB_DEVICE_ID_RETROUSB_SNES_RETROPORT 0x00f1 |