From 80bac5adfaad400eb1e27667095e543f9f54cd6c Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Wed, 20 Oct 2010 15:51:57 -0700
Subject: [PATCH] --- yaml --- r: 220405 b: refs/heads/master c:
 50fe56d24897838d5b65ee4d4baa6cad73de804b h: refs/heads/master i:   220403:
 2ccda1c81ea7661c44354c5186075574c9032451 v: v3

---
 [refs]                                  | 2 +-
 trunk/drivers/staging/hv/channel_mgmt.c | 2 +-
 trunk/drivers/staging/hv/channel_mgmt.h | 2 --
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index ccd96856e58f..fe133bc45bfc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 77099f0afe94928b5b0066a7efa5fa9f81696b54
+refs/heads/master: 50fe56d24897838d5b65ee4d4baa6cad73de804b
diff --git a/trunk/drivers/staging/hv/channel_mgmt.c b/trunk/drivers/staging/hv/channel_mgmt.c
index 0d5dbf3908d9..45dbe305afed 100644
--- a/trunk/drivers/staging/hv/channel_mgmt.c
+++ b/trunk/drivers/staging/hv/channel_mgmt.c
@@ -237,7 +237,7 @@ EXPORT_SYMBOL(hv_cb_utils);
 /*
  * alloc_channel - Allocate and initialize a vmbus channel object
  */
-struct vmbus_channel *alloc_channel(void)
+static struct vmbus_channel *alloc_channel(void)
 {
 	struct vmbus_channel *channel;
 
diff --git a/trunk/drivers/staging/hv/channel_mgmt.h b/trunk/drivers/staging/hv/channel_mgmt.h
index b0ed31f75ebb..d16cc0811169 100644
--- a/trunk/drivers/staging/hv/channel_mgmt.h
+++ b/trunk/drivers/staging/hv/channel_mgmt.h
@@ -307,8 +307,6 @@ struct vmbus_channel_msginfo {
 };
 
 
-struct vmbus_channel *alloc_channel(void);
-
 void free_channel(struct vmbus_channel *channel);
 
 void vmbus_onmessage(void *context);