diff --git a/[refs] b/[refs]
index 351e274cb5fb..9b2d391cb3b9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 786b4557075ae0d8a23e73c316dc4204b41ccb4d
+refs/heads/master: 2218228392080f0ca2fc2974604e79f57b12c436
diff --git a/trunk/include/linux/wireless.h b/trunk/include/linux/wireless.h
index 2864b1699ecc..0a9b5b41ed67 100644
--- a/trunk/include/linux/wireless.h
+++ b/trunk/include/linux/wireless.h
@@ -69,14 +69,9 @@
 
 /***************************** INCLUDES *****************************/
 
-/* This header is used in user-space, therefore need to be sanitised
- * for that purpose. Those includes are usually not compatible with glibc.
- * To know which includes to use in user-space, check iwlib.h. */
-#ifdef __KERNEL__
-#include <linux/types.h>		/* for "caddr_t" et al		*/
+#include <linux/types.h>		/* for __u* and __s* typedefs */
 #include <linux/socket.h>		/* for "struct sockaddr" et al	*/
 #include <linux/if.h>			/* for IFNAMSIZ and co... */
-#endif	/* __KERNEL__ */
 
 /***************************** VERSION *****************************/
 /*