diff options
| author | David S. Miller <davem@davemloft.net> | 2008-05-01 16:04:59 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-05-01 16:04:59 -0700 |
| commit | fb65f180e02dde224af256b43d3ab2c28b9689d7 (patch) | |
| tree | 72b66091be51f3f16c2f9aae75be386a9fccc620 /include/linux | |
| parent | ab59859de1946a098b091308380179e92dc7683b (diff) | |
| parent | 61c2b682b8391f13b67e2d95990a0aba34697d9c (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/wireless.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/include/linux/wireless.h b/include/linux/wireless.h index 2864b1699ecc..0a9b5b41ed67 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 *****************************/ /* |