patch refresh for 4.14

diff --git a/queue-4.14/input-xpad-add-support-for-xbox1-pdp-camo-series-gam.patch b/queue-4.14/input-xpad-add-support-for-xbox1-pdp-camo-series-gam.patch
index d1777a83482e0869d96a5b395b991648db81089e..516be8b9dc9ca1aded5d4f1023b7a7a42b4a07f5 100644 (file)
--- a/queue-4.14/input-xpad-add-support-for-xbox1-pdp-camo-series-gam.patch
+++ b/queue-4.14/input-xpad-add-support-for-xbox1-pdp-camo-series-gam.patch
@@ -19,11 +19,9 @@ Cc: stable@vger.kernel.org
 Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
 Signed-off-by: Sasha Levin <sashal@kernel.org>
 ---
- drivers/input/joystick/xpad.c | 3 +++
+ drivers/input/joystick/xpad.c |    3 +++
  1 file changed, 3 insertions(+)
 
-diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
-index 69b44aebaf01..2e52015634f9 100644
 --- a/drivers/input/joystick/xpad.c
 +++ b/drivers/input/joystick/xpad.c
 @@ -234,6 +234,7 @@ static const struct xpad_device {
@@ -34,7 +32,7 @@ index 69b44aebaf01..2e52015634f9 100644
        { 0x0e6f, 0x0301, "Logic3 Controller", 0, XTYPE_XBOX360 },
        { 0x0e6f, 0x0346, "Rock Candy Gamepad for Xbox One 2016", 0, XTYPE_XBOXONE },
        { 0x0e6f, 0x0401, "Logic3 Controller", 0, XTYPE_XBOX360 },
-@@ -533,6 +534,8 @@ static const struct xboxone_init_packet xboxone_init_packets[] = {
+@@ -533,6 +534,8 @@ static const struct xboxone_init_packet
        XBOXONE_INIT_PKT(0x0e6f, 0x02ab, xboxone_pdp_init2),
        XBOXONE_INIT_PKT(0x0e6f, 0x02a4, xboxone_pdp_init1),
        XBOXONE_INIT_PKT(0x0e6f, 0x02a4, xboxone_pdp_init2),
@@ -43,6 +41,3 @@ index 69b44aebaf01..2e52015634f9 100644
        XBOXONE_INIT_PKT(0x24c6, 0x541a, xboxone_rumblebegin_init),
        XBOXONE_INIT_PKT(0x24c6, 0x542a, xboxone_rumblebegin_init),
        XBOXONE_INIT_PKT(0x24c6, 0x543a, xboxone_rumblebegin_init),
--- 
-2.17.1
-