From: Jiri Kosina <jkosina@suse.cz>
Date: Thu, 17 Mar 2016 12:51:54 +0000 (+0100)
Subject: Merge branches 'for-4.5/upstream-fixes', 'for-4.6/cmedia', 'for-4.6/i2c-hid', 'for... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=e1c9b9ff2420c0d8c25924be312bc422bf9dc056;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

Merge branches 'for-4.5/upstream-fixes', 'for-4.6/cmedia', 'for-4.6/i2c-hid', 'for-4.6/logitech', 'for-4.6/multitouch', 'for-4.6/penmount', 'for-4.6/sony', 'for-4.6/thingm', 'for-4.6/upstream' and 'for-4.6/wacom' into for-linus
---

e1c9b9ff2420c0d8c25924be312bc422bf9dc056
diff --cc drivers/hid/hid-sony.c
index 9b8db0e0ef1c,9b8db0e0ef1c,9b8db0e0ef1c,9b8db0e0ef1c,9b8db0e0ef1c,9b8db0e0ef1c,ccf7ef2d0b5e,9b8db0e0ef1c,0b5015fd864a,9b8db0e0ef1c..310436a54a3f
--- a/drivers/hid/hid-sony.c
+++ b/drivers/hid/hid-sony.c
@@@@@@@@@@@ -249,9 -249,9 -249,9 -249,9 -249,9 -249,9 -250,9 -249,9 -249,9 -249,9 +250,9 @@@@@@@@@@@ static u8 motion_rdesc[] = 
          };
          
          /* PS/3 Navigation controller */
------ ---static __u8 navigation_rdesc[] = {
++++++ +++static u8 navigation_rdesc[] = {
          	0x05, 0x01,         /*  Usage Page (Desktop),               */
-------- -	0x09, 0x04,         /*  Usage (Joystik),                    */
++++++++ +	0x09, 0x04,         /*  Usage (Joystick),                   */
          	0xA1, 0x01,         /*  Collection (Application),           */
          	0xA1, 0x02,         /*      Collection (Logical),           */
          	0x85, 0x01,         /*          Report ID (1),              */