diff --git a/[refs] b/[refs] index 6996f34d96f7..5bbbeed1a168 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a1914f5416352b3229abfb1947395844f7ee2321 +refs/heads/master: 5cf06b0de818effa5de24ba5043348a7478f87a1 diff --git a/trunk/drivers/staging/hv/hv_mouse.c b/trunk/drivers/staging/hv/hv_mouse.c index 15aa2cef3d00..0a5676c681f4 100644 --- a/trunk/drivers/staging/hv/hv_mouse.c +++ b/trunk/drivers/staging/hv/hv_mouse.c @@ -494,7 +494,8 @@ static void reportdesc_callback(struct hv_device *dev, void *packet, u32 len) input_device->hid_device = hid_dev; } -static int mousevsc_on_device_add(struct hv_device *device) +static int mousevsc_probe(struct hv_device *device, + const struct hv_vmbus_device_id *dev_id) { int ret = 0; struct mousevsc_dev *input_dev; @@ -542,13 +543,6 @@ static int mousevsc_on_device_add(struct hv_device *device) return ret; } -static int mousevsc_probe(struct hv_device *dev, - const struct hv_vmbus_device_id *dev_id) -{ - - return mousevsc_on_device_add(dev); - -} static int mousevsc_remove(struct hv_device *dev) {