diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-09 15:12:52 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-09 15:12:52 -0800 |
| commit | 1fd5a46dd6bbca3a1275465120caf4748872c2a7 (patch) | |
| tree | c24862a43f57974394ebb58a1d9005e4093e3bf7 /net/ipv4/ip_output.c | |
| parent | 2cc6055060d975e8c7601f4a1c68ef2d3050b4e9 (diff) | |
| parent | dff2c03534f525813342ab8dec90c5bb1ee07471 (diff) | |
| download | talos-op-linux-1fd5a46dd6bbca3a1275465120caf4748872c2a7.tar.gz talos-op-linux-1fd5a46dd6bbca3a1275465120caf4748872c2a7.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/ipv4/ip_output.c')
| -rw-r--r-- | net/ipv4/ip_output.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c index c2169b47ddfd..3324fbfe528a 100644 --- a/net/ipv4/ip_output.c +++ b/net/ipv4/ip_output.c @@ -69,6 +69,7 @@ #include <net/ip.h> #include <net/protocol.h> #include <net/route.h> +#include <net/xfrm.h> #include <linux/skbuff.h> #include <net/sock.h> #include <net/arp.h> |
