diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-12-29 00:21:55 -0500 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2006-12-31 17:06:49 -0500 |
| commit | cb4db4c22182163f66325053331a4e7096f663cd (patch) | |
| tree | e365f65b1a5a9eb7b6f8f15ede0c5e027d71d43c /include/linux | |
| parent | e44c39bd8478bf9e41cbc611c74b5879a7b29f58 (diff) | |
[NET]: Don't export linux/random.h outside __KERNEL__.
Don't add it there please; add it lower down inside the existing #ifdef
__KERNEL__. You just made the _userspace_ net.h include random.h, which
then fails to compile unless <asm/types.h> was already included.
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/net.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/net.h b/include/linux/net.h index 6f0dfeba509a..f28d8a2e2c91 100644 --- a/include/linux/net.h +++ b/include/linux/net.h | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | #define _LINUX_NET_H | 19 | #define _LINUX_NET_H |
| 20 | 20 | ||
| 21 | #include <linux/wait.h> | 21 | #include <linux/wait.h> |
| 22 | #include <linux/random.h> | ||
| 23 | #include <asm/socket.h> | 22 | #include <asm/socket.h> |
| 24 | 23 | ||
| 25 | struct poll_table_struct; | 24 | struct poll_table_struct; |
| @@ -57,6 +56,7 @@ typedef enum { | |||
| 57 | 56 | ||
| 58 | #ifdef __KERNEL__ | 57 | #ifdef __KERNEL__ |
| 59 | #include <linux/stringify.h> | 58 | #include <linux/stringify.h> |
| 59 | #include <linux/random.h> | ||
| 60 | 60 | ||
| 61 | #define SOCK_ASYNC_NOSPACE 0 | 61 | #define SOCK_ASYNC_NOSPACE 0 |
| 62 | #define SOCK_ASYNC_WAITDATA 1 | 62 | #define SOCK_ASYNC_WAITDATA 1 |
