From 627b736b4c424c6a1fb6b9850978714b1fa8bd59 Mon Sep 17 00:00:00 2001
From: Brian Haley <brian.haley@hp.com>
Date: Wed, 7 Oct 2009 13:57:10 -0700
Subject: [PATCH] --- yaml --- r: 170473 b: refs/heads/master c:
 125a77ed9fbd21d1277f53e9ed6b39ad3d34e613 h: refs/heads/master i:   170471:
 445749a9f3f8d8a52f8bab93c9964339fe47dd02 v: v3

---
 [refs]                          | 2 +-
 trunk/include/linux/if_tunnel.h | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 7df9ac5e68ca..11c0153d1113 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ffce908246c93b17304c313886d25cfa8aecd1d7
+refs/heads/master: 125a77ed9fbd21d1277f53e9ed6b39ad3d34e613
diff --git a/trunk/include/linux/if_tunnel.h b/trunk/include/linux/if_tunnel.h
index c53c8e016940..8d76cb4c86fa 100644
--- a/trunk/include/linux/if_tunnel.h
+++ b/trunk/include/linux/if_tunnel.h
@@ -5,6 +5,7 @@
 
 #ifdef __KERNEL__
 #include <linux/ip.h>
+#include <linux/in6.h>
 #endif
 
 #define SIOCGETTUNNEL   (SIOCDEVPRIVATE + 0)