diff options
| author | Len Brown <len.brown@intel.com> | 2005-09-03 02:44:09 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-09-03 02:44:09 -0400 |
| commit | 129521dcc94f781890f8f668219ab79f0073ff9f (patch) | |
| tree | 9f70707c88da65577f38814fe37b24c4b4957d64 /include/net/ip6_route.h | |
| parent | 824b558bbe2c298b165cdb54c33718994dda30bb (diff) | |
| parent | f505380ba7b98ec97bf25300c2a58aeae903530b (diff) | |
Merge linux-2.6 into linux-acpi-2.6 test
Diffstat (limited to 'include/net/ip6_route.h')
| -rw-r--r-- | include/net/ip6_route.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/net/ip6_route.h b/include/net/ip6_route.h index f920706d526b..1f2e428ca364 100644 --- a/include/net/ip6_route.h +++ b/include/net/ip6_route.h | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | #include <net/flow.h> | 12 | #include <net/flow.h> |
| 13 | #include <net/ip6_fib.h> | 13 | #include <net/ip6_fib.h> |
| 14 | #include <net/sock.h> | 14 | #include <net/sock.h> |
| 15 | #include <linux/tcp.h> | ||
| 16 | #include <linux/ip.h> | 15 | #include <linux/ip.h> |
| 17 | #include <linux/ipv6.h> | 16 | #include <linux/ipv6.h> |
| 18 | 17 | ||