Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1bf4b126 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input 

Pull input fixes from Dmitry Torokhov:
 "Just a small update to xpad driver to recognize yet another gamepad,
  and another change making sure userio.h is exported"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: xpad - add support for Razer Wildcat gamepad
  uapi: add missing install of userio.h
parents 7e703ecc 53763668

drivers/input/joystick/xpad.c

+2 −0
Original line number Diff line number Diff line
@@ -202,6 +202,7 @@ static const struct xpad_device { 
	{ 0x1430, 0x8888, "TX6500+ Dance Pad (first generation)", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX },

	{ 0x146b, 0x0601, "BigBen Interactive XBOX 360 Controller", 0, XTYPE_XBOX360 },

	{ 0x1532, 0x0037, "Razer Sabertooth", 0, XTYPE_XBOX360 },

	{ 0x1532, 0x0a03, "Razer Wildcat", 0, XTYPE_XBOXONE },

	{ 0x15e4, 0x3f00, "Power A Mini Pro Elite", 0, XTYPE_XBOX360 },

	{ 0x15e4, 0x3f0a, "Xbox Airflo wired controller", 0, XTYPE_XBOX360 },

	{ 0x15e4, 0x3f10, "Batarang Xbox 360 controller", 0, XTYPE_XBOX360 },
@@ -326,6 +327,7 @@ static struct usb_device_id xpad_table[] = { 
	XPAD_XBOX360_VENDOR(0x1430),		/* RedOctane X-Box 360 controllers */

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

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

	XPAD_XBOXONE_VENDOR(0x1532),		/* Razer Wildcat */

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

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

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

include/uapi/linux/Kbuild

+1 −0
Original line number Diff line number Diff line
@@ -445,6 +445,7 @@ header-y += unistd.h 
header-y += unix_diag.h

header-y += usbdevice_fs.h

header-y += usbip.h

header-y += userio.h

header-y += utime.h

header-y += utsname.h

header-y += uuid.h