From 33076f1f1c88a0e8f4daf09456874aa0c92dcbb4 Mon Sep 17 00:00:00 2001
From: Nicolas Kaiser <nikai@nikai.net>
Date: Wed, 11 Jan 2006 02:04:35 +0100
Subject: [PATCH] --- yaml --- r: 17822 b: refs/heads/master c:
 b8ab50bc554c2f9149e6d0ae741e05810e581ea5 h: refs/heads/master v: v3

---
 [refs]                                             | 2 +-
 trunk/net/decnet/netfilter/dn_rtmsg.c              | 2 --
 trunk/net/ipv4/netfilter/ip_conntrack_proto_icmp.c | 1 -
 trunk/net/ipv4/netfilter/ip_conntrack_proto_tcp.c  | 1 -
 trunk/net/ipv4/netfilter/ip_conntrack_proto_udp.c  | 1 -
 5 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 9b43022041a9..9605aa524c95 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 864913f30dbd6f75b94045cd20ea0b082996287e
+refs/heads/master: b8ab50bc554c2f9149e6d0ae741e05810e581ea5
diff --git a/trunk/net/decnet/netfilter/dn_rtmsg.c b/trunk/net/decnet/netfilter/dn_rtmsg.c
index 1ab94c6e22ed..16a5a31e2126 100644
--- a/trunk/net/decnet/netfilter/dn_rtmsg.c
+++ b/trunk/net/decnet/netfilter/dn_rtmsg.c
@@ -26,8 +26,6 @@
 #include <net/dn.h>
 #include <net/dn_route.h>
 
-#include <linux/netfilter_decnet.h>
-
 static struct sock *dnrmg = NULL;
 
 
diff --git a/trunk/net/ipv4/netfilter/ip_conntrack_proto_icmp.c b/trunk/net/ipv4/netfilter/ip_conntrack_proto_icmp.c
index f2a90e2743d7..3021af0910f1 100644
--- a/trunk/net/ipv4/netfilter/ip_conntrack_proto_icmp.c
+++ b/trunk/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>
diff --git a/trunk/net/ipv4/netfilter/ip_conntrack_proto_tcp.c b/trunk/net/ipv4/netfilter/ip_conntrack_proto_tcp.c
index ea2b39c18050..e0dc37063545 100644
--- a/trunk/net/ipv4/netfilter/ip_conntrack_proto_tcp.c
+++ b/trunk/net/ipv4/netfilter/ip_conntrack_proto_tcp.c
@@ -32,7 +32,6 @@
 
 #include <net/tcp.h>
 
-#include <linux/netfilter.h>
 #include <linux/netfilter_ipv4.h>
 #include <linux/netfilter_ipv4/ip_conntrack.h>
 #include <linux/netfilter_ipv4/ip_conntrack_protocol.h>
diff --git a/trunk/net/ipv4/netfilter/ip_conntrack_proto_udp.c b/trunk/net/ipv4/netfilter/ip_conntrack_proto_udp.c
index 004003fd6117..55b7d3210adf 100644
--- a/trunk/net/ipv4/netfilter/ip_conntrack_proto_udp.c
+++ b/trunk/net/ipv4/netfilter/ip_conntrack_proto_udp.c
@@ -15,7 +15,6 @@
 #include <linux/udp.h>
 #include <linux/seq_file.h>
 #include <net/checksum.h>
-#include <linux/netfilter.h>
 #include <linux/netfilter_ipv4.h>
 #include <linux/netfilter_ipv4/ip_conntrack_protocol.h>