diff --git a/[refs] b/[refs]
index 2ffc3cd0c0e0..2dadad34e705 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e690b5a9be26965543b7252492ed22052af960b6
+refs/heads/master: 30fbee49b0715ff1eb1f91644983f2c35b9421d5
diff --git a/trunk/drivers/staging/hv/channel.c b/trunk/drivers/staging/hv/channel.c
index b91b36912357..3e4422bc9b18 100644
--- a/trunk/drivers/staging/hv/channel.c
+++ b/trunk/drivers/staging/hv/channel.c
@@ -874,15 +874,3 @@ int vmbus_recvpacket_raw(struct vmbus_channel *channel, void *buffer,
 	return 0;
 }
 EXPORT_SYMBOL_GPL(vmbus_recvpacket_raw);
-
-/*
- * vmbus_ontimer - Timer event callback
- */
-void vmbus_ontimer(unsigned long data)
-{
-	struct vmbus_channel *channel = (struct vmbus_channel *)data;
-
-	if (channel->onchannel_callback)
-		channel->onchannel_callback(channel->channel_callback_context);
-}
-