diff options
| author | Simon Horman <horms@verge.net.au> | 2008-10-06 17:40:11 -0400 |
|---|---|---|
| committer | Simon Horman <horms@verge.net.au> | 2008-10-06 17:40:11 -0400 |
| commit | a5e8546a8bff5d2047adc279df5753c44ba7b1a1 (patch) | |
| tree | d9ca91f74d8279adbb1d3e942cc7ab145780ee29 /net/ipv6/af_inet6.c | |
| parent | cb7f6a7b716e801097b564dec3ccb58d330aef56 (diff) | |
| parent | c7004482e8dcb7c3c72666395cfa98a216a4fb70 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 into lvs-next-2.6
Diffstat (limited to 'net/ipv6/af_inet6.c')
| -rw-r--r-- | net/ipv6/af_inet6.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c index 95055f8c3f35..f018704ecb86 100644 --- a/net/ipv6/af_inet6.c +++ b/net/ipv6/af_inet6.c | |||
| @@ -50,6 +50,7 @@ | |||
| 50 | #include <net/ipip.h> | 50 | #include <net/ipip.h> |
| 51 | #include <net/protocol.h> | 51 | #include <net/protocol.h> |
| 52 | #include <net/inet_common.h> | 52 | #include <net/inet_common.h> |
| 53 | #include <net/route.h> | ||
| 53 | #include <net/transp_v6.h> | 54 | #include <net/transp_v6.h> |
| 54 | #include <net/ip6_route.h> | 55 | #include <net/ip6_route.h> |
| 55 | #include <net/addrconf.h> | 56 | #include <net/addrconf.h> |