Commit c02fc1d9 authored by Daniel Tobias's avatar Daniel Tobias Committed by Dmitry Torokhov
Browse files

Input: xpad - correctly sort vendor id's 



Signed-off-by: default avatarDaniel Tobias <dan.g.tob@gmail.com>
Signed-off-by: default avatarPavel Rojtberg <rojtberg@gmail.com>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent f63bb4f4

drivers/input/joystick/xpad.c

+6 −6
Original line number Diff line number Diff line
@@ -320,18 +320,18 @@ static struct usb_device_id xpad_table[] = { 
	XPAD_XBOXONE_VENDOR(0x0738),		/* Mad Catz FightStick TE 2 */

	XPAD_XBOX360_VENDOR(0x0e6f),		/* 0x0e6f X-Box 360 controllers */

	XPAD_XBOXONE_VENDOR(0x0e6f),		/* 0x0e6f X-Box One controllers */

	XPAD_XBOX360_VENDOR(0x0f0d),		/* Hori Controllers */

	XPAD_XBOXONE_VENDOR(0x0f0d),		/* Hori Controllers */

	XPAD_XBOX360_VENDOR(0x12ab),		/* X-Box 360 dance pads */

	XPAD_XBOX360_VENDOR(0x1430),		/* RedOctane X-Box 360 controllers */

	XPAD_XBOX360_VENDOR(0x146b),		/* BigBen Interactive Controllers */

	XPAD_XBOX360_VENDOR(0x1bad),		/* Harminix Rock Band Guitar and Drums */

	XPAD_XBOX360_VENDOR(0x0f0d),		/* Hori Controllers */

	XPAD_XBOXONE_VENDOR(0x0f0d),		/* Hori Controllers */

	XPAD_XBOX360_VENDOR(0x1689),		/* Razer Onza */

	XPAD_XBOX360_VENDOR(0x24c6),		/* PowerA Controllers */

	XPAD_XBOXONE_VENDOR(0x24c6),		/* PowerA Controllers */

	XPAD_XBOX360_VENDOR(0x1532),		/* Razer Sabertooth */

	XPAD_XBOX360_VENDOR(0x15e4),		/* Numark X-Box 360 controllers */

	XPAD_XBOX360_VENDOR(0x162e),		/* Joytech X-Box 360 controllers */

	XPAD_XBOX360_VENDOR(0x1689),		/* Razer Onza */

	XPAD_XBOX360_VENDOR(0x1bad),		/* Harminix Rock Band Guitar and Drums */

	XPAD_XBOX360_VENDOR(0x24c6),		/* PowerA Controllers */

	XPAD_XBOXONE_VENDOR(0x24c6),		/* PowerA Controllers */

	{ }

};