From a539e9a7bb84fc688d919f7b7050afce0e3be33b Mon Sep 17 00:00:00 2001
From: Yasuyuki Kozakai <yasuyuki.kozakai@toshiba.co.jp>
Date: Sat, 2 Dec 2006 22:12:54 -0800
Subject: [PATCH] --- yaml --- r: 42000 b: refs/heads/master c:
 1863f0965e716cc61d3c23cf106d41aa070f706f h: refs/heads/master v: v3

---
 [refs]                                        | 2 +-
 trunk/net/netfilter/nf_conntrack_amanda.c     | 1 +
 trunk/net/netfilter/nf_conntrack_ecache.c     | 4 ----
 trunk/net/netfilter/nf_conntrack_netbios_ns.c | 1 +
 trunk/net/netfilter/nf_conntrack_sip.c        | 1 +
 trunk/net/netfilter/nf_conntrack_tftp.c       | 1 +
 6 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 38a3c0f58d3c..9278c04dec71 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 13b1833910205289172cdc655cb9bc61188f77e9
+refs/heads/master: 1863f0965e716cc61d3c23cf106d41aa070f706f
diff --git a/trunk/net/netfilter/nf_conntrack_amanda.c b/trunk/net/netfilter/nf_conntrack_amanda.c
index 5c495dc9d942..b8869eab7650 100644
--- a/trunk/net/netfilter/nf_conntrack_amanda.c
+++ b/trunk/net/netfilter/nf_conntrack_amanda.c
@@ -15,6 +15,7 @@
 #include <linux/skbuff.h>
 #include <linux/in.h>
 #include <linux/udp.h>
+#include <linux/netfilter.h>
 
 #include <net/netfilter/nf_conntrack.h>
 #include <net/netfilter/nf_conntrack_expect.h>
diff --git a/trunk/net/netfilter/nf_conntrack_ecache.c b/trunk/net/netfilter/nf_conntrack_ecache.c
index d051694774c7..1a223e0c0856 100644
--- a/trunk/net/netfilter/nf_conntrack_ecache.c
+++ b/trunk/net/netfilter/nf_conntrack_ecache.c
@@ -21,10 +21,6 @@
 #include <linux/netdevice.h>
 
 #include <net/netfilter/nf_conntrack.h>
-#include <net/netfilter/nf_conntrack_l3proto.h>
-#include <net/netfilter/nf_conntrack_l4proto.h>
-#include <net/netfilter/nf_conntrack_expect.h>
-#include <net/netfilter/nf_conntrack_helper.h>
 #include <net/netfilter/nf_conntrack_core.h>
 
 ATOMIC_NOTIFIER_HEAD(nf_conntrack_chain);
diff --git a/trunk/net/netfilter/nf_conntrack_netbios_ns.c b/trunk/net/netfilter/nf_conntrack_netbios_ns.c
index 4fad3ad0b886..a5b234e444dc 100644
--- a/trunk/net/netfilter/nf_conntrack_netbios_ns.c
+++ b/trunk/net/netfilter/nf_conntrack_netbios_ns.c
@@ -24,6 +24,7 @@
 #include <linux/if_addr.h>
 #include <linux/in.h>
 #include <linux/ip.h>
+#include <linux/netfilter.h>
 #include <net/route.h>
 
 #include <net/netfilter/nf_conntrack.h>
diff --git a/trunk/net/netfilter/nf_conntrack_sip.c b/trunk/net/netfilter/nf_conntrack_sip.c
index e0c06795a943..eb2a2411f97b 100644
--- a/trunk/net/netfilter/nf_conntrack_sip.c
+++ b/trunk/net/netfilter/nf_conntrack_sip.c
@@ -14,6 +14,7 @@
 #include <linux/inet.h>
 #include <linux/in.h>
 #include <linux/udp.h>
+#include <linux/netfilter.h>
 
 #include <net/netfilter/nf_conntrack.h>
 #include <net/netfilter/nf_conntrack_expect.h>
diff --git a/trunk/net/netfilter/nf_conntrack_tftp.c b/trunk/net/netfilter/nf_conntrack_tftp.c
index d46a1263fcb5..f5bffe24b0a5 100644
--- a/trunk/net/netfilter/nf_conntrack_tftp.c
+++ b/trunk/net/netfilter/nf_conntrack_tftp.c
@@ -9,6 +9,7 @@
 #include <linux/moduleparam.h>
 #include <linux/in.h>
 #include <linux/udp.h>
+#include <linux/netfilter.h>
 
 #include <net/netfilter/nf_conntrack.h>
 #include <net/netfilter/nf_conntrack_tuple.h>