Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
diff --git a/net/netfilter/xt_length.c b/net/netfilter/xt_length.c
index ab6c710..39c8fae 100644
--- a/net/netfilter/xt_length.c
+++ b/net/netfilter/xt_length.c
@@ -8,6 +8,7 @@
#include <linux/module.h>
#include <linux/skbuff.h>
+#include <linux/ipv6.h>
#include <net/ip.h>
#include <linux/netfilter/xt_length.h>
diff --git a/net/netfilter/xt_tcpudp.c b/net/netfilter/xt_tcpudp.c
index 33f86fd..669c811 100644
--- a/net/netfilter/xt_tcpudp.c
+++ b/net/netfilter/xt_tcpudp.c
@@ -1,6 +1,7 @@
#include <linux/types.h>
#include <linux/module.h>
#include <net/ip.h>
+#include <linux/ipv6.h>
#include <net/ipv6.h>
#include <net/tcp.h>
#include <net/udp.h>
