Merge commit 'v2.6.37' into next

[firefly-linux-kernel-4.4.55.git] / drivers / staging / hv / connection.c

diff --git a/drivers/staging/hv/connection.c b/drivers/staging/hv/connection.c
index 1f4d6683aaa7e15bd716c25ac26c1eee0e30c092..f8477072ace46dae6eb286607534de313e3b7c76 100644 (file)
--- a/drivers/staging/hv/connection.c
+++ b/drivers/staging/hv/connection.c
@@ -254,10 +254,10 @@ static void VmbusProcessChannelEvent(void *context)
        channel = GetChannelFromRelId(relId);
 
        if (channel) {
-               VmbusChannelOnChannelEvent(channel);
+               vmbus_onchannel_event(channel);
                /*
                 * WorkQueueQueueWorkItem(channel->dataWorkQueue,
-                *                        VmbusChannelOnChannelEvent,
+                *                        vmbus_onchannel_event,
                 *                        (void*)channel);
                 */
        } else {