From: Kirill A. Shutemov <kirill@shutemov.name>
Date: Tue, 22 Apr 2008 13:38:55 +0000 (+0300)
Subject: Make linux/wireless.h be able to compile
X-Git-Tag: v2.6.26-rc1~5^2~33^2~2
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=2218228392080f0ca2fc2974604e79f57b12c436;p=linux-2.6-omap-h63xx.git

Make linux/wireless.h be able to compile

Signed-off-by: Kirill A. Shutemov <kirill@shutemov.name>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
---

diff --git a/include/linux/wireless.h b/include/linux/wireless.h
index 2864b1699ec..0a9b5b41ed6 100644
--- a/include/linux/wireless.h
+++ b/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 *****************************/
 /*