diff options
| author | Josh Boyer <jwboyer@fedoraproject.org> | 2014-11-14 08:35:51 -0500 |
|---|---|---|
| committer | Josh Boyer <jwboyer@fedoraproject.org> | 2014-11-14 08:35:51 -0500 |
| commit | 5d76b33ba44470cfcb2fc7c6627c070135b2c914 (patch) | |
| tree | f0752a89782024410b00ebef8514560e97984679 /HID-add-support-for-MS-Surface-Pro-3-Type-Cover.patch | |
| parent | 4afc32034d9118ed2826e6f49caa1dbe0ef7be55 (diff) | |
| download | kernel-5d76b33ba44470cfcb2fc7c6627c070135b2c914.tar.gz kernel-5d76b33ba44470cfcb2fc7c6627c070135b2c914.tar.xz kernel-5d76b33ba44470cfcb2fc7c6627c070135b2c914.zip | |
Linux v3.18-rc4-184-gb23dc5a7cc6e
Diffstat (limited to 'HID-add-support-for-MS-Surface-Pro-3-Type-Cover.patch')
| -rw-r--r-- | HID-add-support-for-MS-Surface-Pro-3-Type-Cover.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/HID-add-support-for-MS-Surface-Pro-3-Type-Cover.patch b/HID-add-support-for-MS-Surface-Pro-3-Type-Cover.patch index b4276610d..18a0c7ec6 100644 --- a/HID-add-support-for-MS-Surface-Pro-3-Type-Cover.patch +++ b/HID-add-support-for-MS-Surface-Pro-3-Type-Cover.patch @@ -19,7 +19,7 @@ Signed-off-by: Jiri Kosina <jkosina@suse.cz> 4 files changed, 10 insertions(+) diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c -index 73bd9e2e42bc..e94afcc19eda 100644 +index 3402033fa52a..3d3820ecaa49 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c @@ -702,6 +702,11 @@ static void hid_scan_collection(struct hid_parser *parser, unsigned type) @@ -34,7 +34,7 @@ index 73bd9e2e42bc..e94afcc19eda 100644 } static int hid_scan_main(struct hid_parser *parser, struct hid_item *item) -@@ -1861,6 +1866,7 @@ static const struct hid_device_id hid_have_special_driver[] = { +@@ -1862,6 +1867,7 @@ static const struct hid_device_id hid_have_special_driver[] = { { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_DIGITAL_MEDIA_3K) }, { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_WIRELESS_OPTICAL_DESKTOP_3_0) }, { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_OFFICE_KB) }, @@ -43,10 +43,10 @@ index 73bd9e2e42bc..e94afcc19eda 100644 { HID_USB_DEVICE(USB_VENDOR_ID_MSI, USB_DEVICE_ID_MSI_GT683R_LED_PANEL) }, { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN) }, diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h -index e23ab8b30626..15f32c22178c 100644 +index 7c863738e419..ab562f41c00c 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h -@@ -648,6 +648,7 @@ +@@ -649,6 +649,7 @@ #define USB_DEVICE_ID_MS_SURFACE_PRO_2 0x0799 #define USB_DEVICE_ID_MS_TOUCH_COVER_2 0x07a7 #define USB_DEVICE_ID_MS_TYPE_COVER_2 0x07a9 @@ -68,10 +68,10 @@ index 8ba17a946f2a..cacda43f6a6f 100644 { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_PRESENTER_8K_BT), .driver_data = MS_PRESENTER }, diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c -index 5014bb567b29..cebfaf288bd3 100644 +index 552671ee7c5d..41814fced1cc 100644 --- a/drivers/hid/usbhid/hid-quirks.c +++ b/drivers/hid/usbhid/hid-quirks.c -@@ -77,6 +77,7 @@ static const struct hid_blacklist { +@@ -78,6 +78,7 @@ static const struct hid_blacklist { { USB_VENDOR_ID_FORMOSA, USB_DEVICE_ID_FORMOSA_IR_RECEIVER, HID_QUIRK_NO_INIT_REPORTS }, { USB_VENDOR_ID_FREESCALE, USB_DEVICE_ID_FREESCALE_MX28, HID_QUIRK_NOGET }, { USB_VENDOR_ID_MGE, USB_DEVICE_ID_MGE_UPS, HID_QUIRK_NOGET }, |