git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] Merge headphone and speaker volume controls for Panasonic R4 laptop
[safe/jmp/linux-2.6]
/
net
/
tipc
/
user_reg.h
diff --git
a/net/tipc/user_reg.h
b/net/tipc/user_reg.h
index
0f96004
..
d0e8879
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
*
/*
* net/tipc/user_reg.h: Include file for TIPC user registry code
*
- * Copyright (c) 200
3-2005, Ericsson Research Canada
+ * Copyright (c) 200
0-2006, Ericsson AB
* Copyright (c) 2005, Wind River Systems
* 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
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@
-40,10
+39,10
@@
#include "port.h"
#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
#endif