diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-13 15:28:10 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-13 15:28:10 -0800 |
| commit | 69eebed240b32377b9034551f1b8c4ae2774ceb6 (patch) | |
| tree | 6955dbf8110c6f03d64747fe55e1feb1d81e951f /include/net/netfilter/ipv4/nf_conntrack_ipv4.h | |
| parent | 67daf5f11f06b9b15f8320de1d237ccc2e74fe43 (diff) | |
| parent | dca80b962a811a0454d779ab6250b59446a8c86c (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'include/net/netfilter/ipv4/nf_conntrack_ipv4.h')
| -rw-r--r-- | include/net/netfilter/ipv4/nf_conntrack_ipv4.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/net/netfilter/ipv4/nf_conntrack_ipv4.h b/include/net/netfilter/ipv4/nf_conntrack_ipv4.h index 25b081a730e..91684436af8 100644 --- a/include/net/netfilter/ipv4/nf_conntrack_ipv4.h +++ b/include/net/netfilter/ipv4/nf_conntrack_ipv4.h @@ -37,7 +37,4 @@ struct nf_conntrack_ipv4 { struct sk_buff * nf_ct_ipv4_ct_gather_frags(struct sk_buff *skb); -/* call to create an explicit dependency on nf_conntrack_l3proto_ipv4. */ -extern void need_ip_conntrack(void); - #endif /*_NF_CONNTRACK_IPV4_H*/ |