Pull acpi_device_handle_cleanup into release branch

[linux-2.6-omap-h63xx.git] / net / tipc / user_reg.h

diff --git a/net/tipc/user_reg.h b/net/tipc/user_reg.h
index 122ca9be36711775c2b0f67a1d3548017cf6117b..d0e88794ed1b48b938d5390027ba3fea923f3e13 100644 (file)
--- 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