Merge branch 'for-3.15/hid-core-ll-transport-cleanup' into for-linus

Conflicts:
	drivers/hid/hid-ids.h
	drivers/hid/hid-sony.c
	drivers/hid/i2c-hid/i2c-hid.c

1 files changed, 10 insertions, 0 deletions

diff --git a/drivers/hid/hid-hyperv.c b/drivers/hid/hid-hyperv.c
index c24908f14934..f52dbcb7133b 100644
--- a/drivers/hid/hid-hyperv.c
+++ b/drivers/hid/hid-hyperv.c
@@ -460,12 +460,22 @@ static void mousevsc_hid_stop(struct hid_device *hid)
 {
 }
 
+static int mousevsc_hid_raw_request(struct hid_device *hid,
+                                    unsigned char report_num,
+                                    __u8 *buf, size_t len,
+                                    unsigned char rtype,
+                                    int reqtype)
+{
+        return 0;
+}
+
 static struct hid_ll_driver mousevsc_ll_driver = {
         .parse = mousevsc_hid_parse,
         .open = mousevsc_hid_open,
         .close = mousevsc_hid_close,
         .start = mousevsc_hid_start,
         .stop = mousevsc_hid_stop,
+        .raw_request = mousevsc_hid_raw_request,
 };
 
 static struct hid_driver mousevsc_hid_driver;