diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2017-06-15 10:55:26 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2017-06-15 10:55:26 -0400 |
| commit | 4c4e393bddcc965a8614d9c2292e92583d69ddfa (patch) | |
| tree | 830f7ef587c7bfe4476d9831d709d4c256336924 | |
| parent | eba84d958df2fd6c349ef69b6c9799ab4ee26613 (diff) | |
| download | longterm-queue-4.8-4c4e393bddcc965a8614d9c2292e92583d69ddfa.tar.gz | |
xpad: context refresh
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/Input-xpad-add-support-for-Razer-Wildcat-gamepad.patch | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/queue/Input-xpad-add-support-for-Razer-Wildcat-gamepad.patch b/queue/Input-xpad-add-support-for-Razer-Wildcat-gamepad.patch index 560fb8f..07f8365 100644 --- a/queue/Input-xpad-add-support-for-Razer-Wildcat-gamepad.patch +++ b/queue/Input-xpad-add-support-for-Razer-Wildcat-gamepad.patch @@ -1,4 +1,4 @@ -From 5376366886251e2f8f248704adb620a4bc4c0937 Mon Sep 17 00:00:00 2001 +From 055d801133a565546d458eaf7e8cd8241fd6b3c8 Mon Sep 17 00:00:00 2001 From: Cameron Gutman <aicommander@gmail.com> Date: Mon, 10 Apr 2017 20:44:25 -0700 Subject: [PATCH] Input: xpad - add support for Razer Wildcat gamepad @@ -8,12 +8,13 @@ commit 5376366886251e2f8f248704adb620a4bc4c0937 upstream. Cc: stable@vger.kernel.org Signed-off-by: Cameron Gutman <aicommander@gmail.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c -index 155fcb3b6230..153b1ee13e03 100644 +index bbe15243b8e7..f397a5b6910f 100644 --- a/drivers/input/joystick/xpad.c +++ b/drivers/input/joystick/xpad.c -@@ -202,6 +202,7 @@ static const struct xpad_device { +@@ -201,6 +201,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 }, @@ -21,14 +22,14 @@ index 155fcb3b6230..153b1ee13e03 100644 { 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 */ +@@ -329,6 +330,7 @@ static struct usb_device_id xpad_table[] = { + XPAD_XBOX360_VENDOR(0x24c6), /* PowerA Controllers */ + XPAD_XBOXONE_VENDOR(0x24c6), /* PowerA 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 */ + { } -- 2.12.0 |