Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git

Signed-off-by: Steve French <sfrench@us.ibm.com>

1 files changed, 4 insertions, 4 deletions

diff --git a/net/tipc/discover.c b/net/tipc/discover.c
index 53ba4630c10d..92601385e5f5 100644
--- a/net/tipc/discover.c
+++ b/net/tipc/discover.c
@@ -110,10 +110,10 @@ void tipc_disc_link_event(u32 addr, char *name, int up)
  * @b_ptr: ptr to bearer issuing message
  */
 
-struct sk_buff *tipc_disc_init_msg(u32 type,
-                                   u32 req_links,
-                                   u32 dest_domain,
-                                   struct bearer *b_ptr)
+static struct sk_buff *tipc_disc_init_msg(u32 type,
+                                          u32 req_links,
+                                          u32 dest_domain,
+                                          struct bearer *b_ptr)
 {
         struct sk_buff *buf = buf_acquire(DSC_H_SIZE);
         struct tipc_msg *msg;