diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-05-06 13:55:32 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-05-06 13:55:32 -0400 |
| commit | a815752ac0ffdb910e92958d41d28f4fb28e5296 (patch) | |
| tree | a3aa16a282354da0debe8e3a3a7ed8aac6e54001 /include/linux/wireless.h | |
| parent | 5ade9deaaa3e1f7291467d97b238648e43eae15e (diff) | |
| parent | a15306365a16380f3bafee9e181ba01231d4acd7 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/linux/wireless.h')
| -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 @@ | |||
| 69 | 69 | ||
| 70 | /***************************** INCLUDES *****************************/ | 70 | /***************************** INCLUDES *****************************/ |
| 71 | 71 | ||
| 72 | /* This header is used in user-space, therefore need to be sanitised | 72 | #include <linux/types.h> /* for __u* and __s* typedefs */ |
| 73 | * for that purpose. Those includes are usually not compatible with glibc. | ||
| 74 | * To know which includes to use in user-space, check iwlib.h. */ | ||
| 75 | #ifdef __KERNEL__ | ||
| 76 | #include <linux/types.h> /* for "caddr_t" et al */ | ||
| 77 | #include <linux/socket.h> /* for "struct sockaddr" et al */ | 73 | #include <linux/socket.h> /* for "struct sockaddr" et al */ |
| 78 | #include <linux/if.h> /* for IFNAMSIZ and co... */ | 74 | #include <linux/if.h> /* for IFNAMSIZ and co... */ |
| 79 | #endif /* __KERNEL__ */ | ||
| 80 | 75 | ||
| 81 | /***************************** VERSION *****************************/ | 76 | /***************************** VERSION *****************************/ |
| 82 | /* | 77 | /* |