Skip to content

Commit e2e9e16

Browse files
committed
Merge tag 'input-for-v6.16-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input fix from Dmitry Torokhov: - just a small fixup to the xpad driver correcting the recent addition of the Acer NGR200 controller * tag 'input-for-v6.16-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: Input: xpad - set correct controller type for Acer NGR200
2 parents f4a40a4 + bcce050 commit e2e9e16

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/input/joystick/xpad.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,12 +172,12 @@ static const struct xpad_device {
172172
{ 0x046d, 0xca88, "Logitech Compact Controller for Xbox", 0, XTYPE_XBOX },
173173
{ 0x046d, 0xca8a, "Logitech Precision Vibration Feedback Wheel", 0, XTYPE_XBOX },
174174
{ 0x046d, 0xcaa3, "Logitech DriveFx Racing Wheel", 0, XTYPE_XBOX360 },
175+
{ 0x0502, 0x1305, "Acer NGR200", 0, XTYPE_XBOX360 },
175176
{ 0x056e, 0x2004, "Elecom JC-U3613M", 0, XTYPE_XBOX360 },
176177
{ 0x05fd, 0x1007, "Mad Catz Controller (unverified)", 0, XTYPE_XBOX },
177178
{ 0x05fd, 0x107a, "InterAct 'PowerPad Pro' X-Box pad (Germany)", 0, XTYPE_XBOX },
178179
{ 0x05fe, 0x3030, "Chic Controller", 0, XTYPE_XBOX },
179180
{ 0x05fe, 0x3031, "Chic Controller", 0, XTYPE_XBOX },
180-
{ 0x0502, 0x1305, "Acer NGR200", 0, XTYPE_XBOX },
181181
{ 0x062a, 0x0020, "Logic3 Xbox GamePad", 0, XTYPE_XBOX },
182182
{ 0x062a, 0x0033, "Competition Pro Steering Wheel", 0, XTYPE_XBOX },
183183
{ 0x06a3, 0x0200, "Saitek Racing Wheel", 0, XTYPE_XBOX },

0 commit comments

Comments
 (0)