X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=net%2Ftipc%2Fuser_reg.h;h=81dc12e2882f02abc575fa1248fabcf3ad2c76a7;hb=f221e726bf4e082a05dcd573379ac859bfba7126;hp=3a55c755f1fd29a00c55336ee86dd15a814cb84b;hpb=9da1c8b694f8e72a16f259614caaae50cbcdaf10;p=linux-2.6-omap-h63xx.git

diff --git a/net/tipc/user_reg.h b/net/tipc/user_reg.h
index 3a55c755f1f..81dc12e2882 100644
--- a/net/tipc/user_reg.h
+++ b/net/tipc/user_reg.h
@@ -1,7 +1,7 @@
 /*
  * net/tipc/user_reg.h: Include file for TIPC user registry code
- * 
- * Copyright (c) 2003-2006, Ericsson AB
+ *
+ * Copyright (c) 2000-2006, Ericsson AB
  * Copyright (c) 2005, Wind River Systems
  * All rights reserved.
  *
@@ -39,10 +39,10 @@
 
 #include "port.h"
 
-int reg_start(void);
-void reg_stop(void);
+int tipc_reg_start(void);
+void tipc_reg_stop(void);
 
-int reg_add_port(struct user_port *up_ptr);
-int reg_remove_port(struct user_port *up_ptr);
+int tipc_reg_add_port(struct user_port *up_ptr);
+int tipc_reg_remove_port(struct user_port *up_ptr);
 
 #endif