projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...
[powerpc.git]
/
net
/
netfilter
/
nf_conntrack_standalone.c
diff --git
a/net/netfilter/nf_conntrack_standalone.c
b/net/netfilter/nf_conntrack_standalone.c
index
75577e1
..
c72aa3c
100644
(file)
--- a/
net/netfilter/nf_conntrack_standalone.c
+++ b/
net/netfilter/nf_conntrack_standalone.c
@@
-806,18
+806,18
@@
void nf_conntrack_protocol_unregister(struct nf_conntrack_protocol *proto)
nf_ct_iterate_cleanup(kill_proto, proto);
}
nf_ct_iterate_cleanup(kill_proto, proto);
}
-static int __init init(void)
+static int __init
nf_conntrack_standalone_
init(void)
{
return init_or_cleanup(1);
}
{
return init_or_cleanup(1);
}
-static void __exit fini(void)
+static void __exit
nf_conntrack_standalone_
fini(void)
{
init_or_cleanup(0);
}
{
init_or_cleanup(0);
}
-module_init(init);
-module_exit(fini);
+module_init(
nf_conntrack_standalone_
init);
+module_exit(
nf_conntrack_standalone_
fini);
/* Some modules need us, but don't depend directly on any symbol.
They should call this. */
/* Some modules need us, but don't depend directly on any symbol.
They should call this. */