From 51827834c3e8e2eda0cc59b4e986a2c14d5dd7c4 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Mon, 21 Jul 2008 13:41:16 -0700
Subject: [PATCH] --- yaml --- r: 104877 b: refs/heads/master c:
 ebb36a978131810c98e7198b1187090c697cf99f h: refs/heads/master i:   104875:
 ad2739e65cdfc0f7f2bf4dbb5e8c967cf9db274a v: v3

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

diff --git a/[refs] b/[refs]
index 159bb2f869c5..f923447b0c15 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 47112e25da41d9059626033986dc3353e101f815
+refs/heads/master: ebb36a978131810c98e7198b1187090c697cf99f
diff --git a/trunk/include/linux/ipv6.h b/trunk/include/linux/ipv6.h
index 391ad0843a46..641e026eee8f 100644
--- a/trunk/include/linux/ipv6.h
+++ b/trunk/include/linux/ipv6.h
@@ -123,6 +123,7 @@ struct ipv6hdr {
 	struct	in6_addr	daddr;
 };
 
+#ifdef __KERNEL__
 /*
  * This structure contains configuration options per IPv6 link.
  */
@@ -167,6 +168,7 @@ struct ipv6_devconf {
 	__s32		accept_dad;
 	void		*sysctl;
 };
+#endif
 
 /* index values for the variables in ipv6_devconf */
 enum {