summaryrefslogtreecommitdiffstats
path: root/net/tipc/user_reg.h
diff options
context:
space:
mode:
authorDavid Teigland <teigland@redhat.com>2006-01-20 08:59:41 +0000
committerSteven Whitehouse <steve@chygwyn.com>2006-01-20 08:59:41 +0000
commit044399b2cb6ad2d7f63cfca945268853d7443a4d (patch)
tree5f96eb307b0389ac0b919a4744a40862b615e9da /net/tipc/user_reg.h
parent901359256b2666f52a3a7d3f31927677e91b3a2a (diff)
parent18a4144028f056b77d6576d4eb284246e9c7ea97 (diff)
Merge branch 'master'
Diffstat (limited to 'net/tipc/user_reg.h')
-rw-r--r--net/tipc/user_reg.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/net/tipc/user_reg.h b/net/tipc/user_reg.h
index 122ca9be367..d0e88794ed1 100644
--- a/net/tipc/user_reg.h
+++ b/net/tipc/user_reg.h
@@ -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