diff --git a/[refs] b/[refs]
index 44b42409953c..c2d5e5dd0427 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 375d65db27544a183aed5e14aa2ed487c796c78d
+refs/heads/master: 6610944a91079a4002da310d3d5488feaae4a74a
diff --git a/trunk/drivers/staging/hv/hyperv_utils.c b/trunk/drivers/staging/hv/hyperv_utils.c
index ca52fbada7d1..cbebad3e40a0 100644
--- a/trunk/drivers/staging/hv/hyperv_utils.c
+++ b/trunk/drivers/staging/hv/hyperv_utils.c
@@ -24,7 +24,6 @@
 #include <linux/slab.h>
 #include <linux/sysctl.h>
 #include <linux/reboot.h>
-#include <linux/version.h>
 
 #include "logging.h"
 #include "osd.h"
@@ -38,7 +37,7 @@
 #include "utils.h"
 
 
-void shutdown_onchannelcallback(void *context)
+static void shutdown_onchannelcallback(void *context)
 {
 	struct vmbus_channel *channel = context;
 	u8 *buf;