diff options
| author | Steve French <sfrench@us.ibm.com> | 2009-02-03 15:19:23 +0000 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2009-02-03 15:19:23 +0000 |
| commit | e1f81c8a417be466e85a38b61679aa6860ec7331 (patch) | |
| tree | 749815f74bfad330e83560a10fd5da5fc4d8c765 /include/linux/ip6_tunnel.h | |
| parent | 0e2bedaa394f74fa9f75ee937488c33d90039b5a (diff) | |
| parent | b1792e367053968f2ddb48bc911d314143ce6242 (diff) | |
| download | linux-e1f81c8a417be466e85a38b61679aa6860ec7331.tar.gz linux-e1f81c8a417be466e85a38b61679aa6860ec7331.tar.bz2 linux-e1f81c8a417be466e85a38b61679aa6860ec7331.zip | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/linux/ip6_tunnel.h')
| -rw-r--r-- | include/linux/ip6_tunnel.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/ip6_tunnel.h b/include/linux/ip6_tunnel.h index 1e7cc4af40de..acb9ad684d63 100644 --- a/include/linux/ip6_tunnel.h +++ b/include/linux/ip6_tunnel.h @@ -1,6 +1,8 @@ #ifndef _IP6_TUNNEL_H #define _IP6_TUNNEL_H +#include <linux/types.h> + #define IPV6_TLV_TNL_ENCAP_LIMIT 4 #define IPV6_DEFAULT_TNL_ENCAP_LIMIT 4 |