diff --git a/[refs] b/[refs]
index 1db44ad5a42b..4262ea0b2d51 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ede16af4cdbd21fa15d4178beb7c6fcbcccd07e9
+refs/heads/master: c88e6f51c2154c7606f7e281bcca2d1a2c89d7b2
diff --git a/trunk/include/linux/netdevice.h b/trunk/include/linux/netdevice.h
index f27fd2009334..25f87102ab66 100644
--- a/trunk/include/linux/netdevice.h
+++ b/trunk/include/linux/netdevice.h
@@ -88,6 +88,8 @@ struct wireless_dev;
 #define NETDEV_TX_BUSY 1	/* driver tx path was busy*/
 #define NETDEV_TX_LOCKED -1	/* driver tx lock was already taken */
 
+#ifdef  __KERNEL__
+
 /*
  *	Compute the worst case header length according to the protocols
  *	used.
@@ -114,6 +116,8 @@ struct wireless_dev;
 #define MAX_HEADER (LL_MAX_HEADER + 48)
 #endif
 
+#endif  /*  __KERNEL__  */
+
 struct net_device_subqueue
 {
 	/* Give a control state for each queue.  This struct may contain