aboutsummaryrefslogtreecommitdiffstats
path: root/include/net/ip6_route.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-08-29 17:36:46 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-08-29 17:36:46 -0700
commit826509f8110049663799bc20f2b5b6170e2f78ca (patch)
tree9d8823cf283592625b882125b4b13988f2934cc6 /include/net/ip6_route.h
parentd992895ba2b27cf5adf1ba0ad6d27662adc54c5e (diff)
parentc530cfb1ce1e8f230744c3f3bd86771f50725053 (diff)
downloadkernel_samsung_aries-826509f8110049663799bc20f2b5b6170e2f78ca.zip
kernel_samsung_aries-826509f8110049663799bc20f2b5b6170e2f78ca.tar.gz
kernel_samsung_aries-826509f8110049663799bc20f2b5b6170e2f78ca.tar.bz2
Merge HEAD from master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6.git
Diffstat (limited to 'include/net/ip6_route.h')
-rw-r--r--include/net/ip6_route.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/net/ip6_route.h b/include/net/ip6_route.h
index f920706..1f2e428 100644
--- a/include/net/ip6_route.h
+++ b/include/net/ip6_route.h
@@ -12,7 +12,6 @@
#include <net/flow.h>
#include <net/ip6_fib.h>
#include <net/sock.h>
-#include <linux/tcp.h>
#include <linux/ip.h>
#include <linux/ipv6.h>