Commit e2e9e161 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents f4a40a42 bcce0504

drivers/input/joystick/xpad.c

+1 −1
Original line number Diff line number Diff line
@@ -172,12 +172,12 @@ static const struct xpad_device { 
	{ 0x046d, 0xca88, "Logitech Compact Controller for Xbox", 0, XTYPE_XBOX },

	{ 0x046d, 0xca8a, "Logitech Precision Vibration Feedback Wheel", 0, XTYPE_XBOX },

	{ 0x046d, 0xcaa3, "Logitech DriveFx Racing Wheel", 0, XTYPE_XBOX360 },

	{ 0x0502, 0x1305, "Acer NGR200", 0, XTYPE_XBOX360 },

	{ 0x056e, 0x2004, "Elecom JC-U3613M", 0, XTYPE_XBOX360 },

	{ 0x05fd, 0x1007, "Mad Catz Controller (unverified)", 0, XTYPE_XBOX },

	{ 0x05fd, 0x107a, "InterAct 'PowerPad Pro' X-Box pad (Germany)", 0, XTYPE_XBOX },

	{ 0x05fe, 0x3030, "Chic Controller", 0, XTYPE_XBOX },

	{ 0x05fe, 0x3031, "Chic Controller", 0, XTYPE_XBOX },

	{ 0x0502, 0x1305, "Acer NGR200", 0, XTYPE_XBOX },

	{ 0x062a, 0x0020, "Logic3 Xbox GamePad", 0, XTYPE_XBOX },

	{ 0x062a, 0x0033, "Competition Pro Steering Wheel", 0, XTYPE_XBOX },

	{ 0x06a3, 0x0200, "Saitek Racing Wheel", 0, XTYPE_XBOX },