diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2024-07-15 15:50:05 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2024-07-15 15:50:05 -0700 |
| commit | 3daee2e4b3568f0ed88b0598df96547fcf21cb9b (patch) | |
| tree | 19f47d0d4d3ff05266a25364959f0012a1825131 /drivers/input/joystick | |
| parent | f3efefb6fdcce604413135bd8d4c5568e53a1f13 (diff) | |
| parent | 0c3836482481200ead7b416ca80c68a29cfdaabd (diff) | |
Merge tag 'v6.10' into next
Sync up with mainline to bring in device_for_each_child_node_scoped()
and other newer APIs.
Diffstat (limited to 'drivers/input/joystick')
| -rw-r--r-- | drivers/input/joystick/xpad.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c index 40a4ddee0b14..4eda18f4f46e 100644 --- a/drivers/input/joystick/xpad.c +++ b/drivers/input/joystick/xpad.c @@ -209,6 +209,7 @@ static const struct xpad_device { { 0x0738, 0xf738, "Super SFIV FightStick TE S", 0, XTYPE_XBOX360 }, { 0x07ff, 0xffff, "Mad Catz GamePad", 0, XTYPE_XBOX360 }, { 0x0b05, 0x1a38, "ASUS ROG RAIKIRI", 0, XTYPE_XBOXONE }, + { 0x0b05, 0x1abb, "ASUS ROG RAIKIRI PRO", 0, XTYPE_XBOXONE }, { 0x0c12, 0x0005, "Intec wireless", 0, XTYPE_XBOX }, { 0x0c12, 0x8801, "Nyko Xbox Controller", 0, XTYPE_XBOX }, { 0x0c12, 0x8802, "Zeroplus Xbox Controller", 0, XTYPE_XBOX }, |