projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream' into irq-pio
[powerpc.git]
/
net
/
netfilter
/
nf_conntrack_l3proto_generic.c
diff --git
a/net/netfilter/nf_conntrack_l3proto_generic.c
b/net/netfilter/nf_conntrack_l3proto_generic.c
index
7de4f06
..
3fc58e4
100644
(file)
--- a/
net/netfilter/nf_conntrack_l3proto_generic.c
+++ b/
net/netfilter/nf_conntrack_l3proto_generic.c
@@
-94,5
+94,4
@@
struct nf_conntrack_l3proto nf_conntrack_generic_l3proto = {
.print_conntrack = generic_print_conntrack,
.prepare = generic_prepare,
.get_features = generic_get_features,
.print_conntrack = generic_print_conntrack,
.prepare = generic_prepare,
.get_features = generic_get_features,
- .me = THIS_MODULE,
};
};