summaryrefslogtreecommitdiffstats
path: root/net/ipv6/xfrm6_mode_tunnel.c
diff options
context:
space:
mode:
authorAnton Vorontsov <cbouatmailru@gmail.com>2010-04-26 21:56:19 +0400
committerAnton Vorontsov <cbouatmailru@gmail.com>2010-04-26 21:56:19 +0400
commit8ef1bb539203629f77a61976e4f25415e1083bff (patch)
tree4fee25aca0928f112716fb02d27b1b355d0843b4 /net/ipv6/xfrm6_mode_tunnel.c
parenta3bcbbee83f55cbaec9b2ad748e7300c7feb2192 (diff)
parentb91ce4d14a21fc04d165be30319541e0f9204f15 (diff)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'net/ipv6/xfrm6_mode_tunnel.c')
-rw-r--r--net/ipv6/xfrm6_mode_tunnel.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ipv6/xfrm6_mode_tunnel.c b/net/ipv6/xfrm6_mode_tunnel.c
index 3927832227b..b809812c8d3 100644
--- a/net/ipv6/xfrm6_mode_tunnel.c
+++ b/net/ipv6/xfrm6_mode_tunnel.c
@@ -5,6 +5,7 @@
* Copyright (c) 2004-2006 Herbert Xu <herbert@gondor.apana.org.au>
*/
+#include <linux/gfp.h>
#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/module.h>