projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'e1000-fixes' of git://198.78.49.142/~jbrandeb/linux-2.6
[powerpc.git]
/
net
/
ipv4
/
netfilter
/
ip_conntrack_proto_icmp.c
diff --git
a/net/ipv4/netfilter/ip_conntrack_proto_icmp.c
b/net/ipv4/netfilter/ip_conntrack_proto_icmp.c
index
f2a90e2
..
3021af0
100644
(file)
--- a/
net/ipv4/netfilter/ip_conntrack_proto_icmp.c
+++ b/
net/ipv4/netfilter/ip_conntrack_proto_icmp.c
@@
-16,7
+16,6
@@
#include <linux/skbuff.h>
#include <net/ip.h>
#include <net/checksum.h>
-#include <linux/netfilter.h>
#include <linux/netfilter_ipv4.h>
#include <linux/netfilter_ipv4/ip_conntrack.h>
#include <linux/netfilter_ipv4/ip_conntrack_core.h>