Merge git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6

[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 0f96004ebdccda818d7a4f8f63cf68f636a068cd..81dc12e2882f02abc575fa1248fabcf3ad2c76a7 100644 (file)
--- a/net/tipc/user_reg.h
+++ b/net/tipc/user_reg.h
@@ -1,9 +1,8 @@
 /*
  * net/tipc/user_reg.h: Include file for TIPC user registry code
- * 
- * Copyright (c) 2003-2005, Ericsson Research Canada
+ *
+ * Copyright (c) 2000-2006, Ericsson AB
  * Copyright (c) 2005, Wind River Systems
- * Copyright (c) 2005-2006, Ericsson AB
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -40,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