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 {