projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[cascardo/linux.git]
/
include
/
net
/
phonet
/
phonet.h
diff --git
a/include/net/phonet/phonet.h
b/include/net/phonet/phonet.h
index
057b0a8
..
d43f71b
100644
(file)
--- a/
include/net/phonet/phonet.h
+++ b/
include/net/phonet/phonet.h
@@
-105,7
+105,6
@@
void phonet_proto_unregister(int protocol, struct phonet_protocol *pp);
int phonet_sysctl_init(void);
void phonet_sysctl_exit(void);
-void phonet_netlink_register(void);
int isi_register(void);
void isi_unregister(void);