projects / linux-2.6-microblaze.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e72455b 346338e c4f0126 16863fb 0b66fb3 c08ce25 328de1c 27a6f70)
Merge branches 'for-5.7/upstream-fixes', 'for-5.8/apple', 'for-5.8/asus', 'for-5...
authorJiri Kosina <jkosina@suse.cz>
Wed, 3 Jun 2020 20:23:52 +0000 (22:23 +0200)
committerJiri Kosina <jkosina@suse.cz>
Wed, 3 Jun 2020 20:23:52 +0000 (22:23 +0200)
1  2  3  4  5  6  7  8 
drivers/hid/Kconfig patch | diff1 | diff2 | diff3 | diff4 | diff5 | diff6 | diff7 | diff8 | blob | history
drivers/hid/hid-ids.h patch | diff1 | diff2 | diff3 | diff4 | diff5 | diff6 | diff7 | diff8 | blob | history

diff --cc drivers/hid/Kconfig
Simple merge
diff --cc drivers/hid/hid-ids.h
index f03f1cc,1c71a1a,09eb3d8,b18b131,1c71a1a,b18b131,b18b131,5942e75..874fc37
--- 1/drivers/hid/hid-ids.h
--- 2/drivers/hid/hid-ids.h
--- 3/drivers/hid/hid-ids.h
--- 4/drivers/hid/hid-ids.h
--- 5/drivers/hid/hid-ids.h
--- 6/drivers/hid/hid-ids.h
--- 7/drivers/hid/hid-ids.h
--- 8/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@@@@@@@@ -76,12 -76,12 -76,12 -76,12 -76,12 -76,12 -76,12 -76,9 +76,9 @@@@@@@@@
        
        #define USB_VENDOR_ID_ALPS_JP           0x044E
        #define HID_DEVICE_ID_ALPS_U1_DUAL      0x120B
------- #define HID_DEVICE_ID_ALPS_U1_DUAL_PTP  0x121F
------- #define HID_DEVICE_ID_ALPS_U1_DUAL_3BTN_PTP     0x1220
        #define HID_DEVICE_ID_ALPS_U1           0x1215
   + ++ #define HID_DEVICE_ID_ALPS_U1_UNICORN_LEGACY         0x121E
        #define HID_DEVICE_ID_ALPS_T4_BTNLESS   0x120C
------- #define HID_DEVICE_ID_ALPS_1222         0x1222
   - -- 
        
        #define USB_VENDOR_ID_AMI               0x046b
        #define USB_DEVICE_ID_AMI_VIRT_KEYBOARD_AND_MOUSE       0xff10
MicroBlaze GIT Repository