diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-10 14:05:45 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-10 14:05:45 +0200 |
| commit | 3ce9bcb583536c45a46c7302747029450e22279c (patch) | |
| tree | 7a4167189ffc6dc909151d1a5d040f9f0656a9f4 /include/linux/net.h | |
| parent | 26fd10517e810dd59ea050b052de24a75ee6dc07 (diff) | |
| parent | f7d0b926ac8c8ec0c7a83ee69409bd2e6bb39f81 (diff) | |
| download | kernel-crypto-3ce9bcb583536c45a46c7302747029450e22279c.tar.gz kernel-crypto-3ce9bcb583536c45a46c7302747029450e22279c.tar.xz kernel-crypto-3ce9bcb583536c45a46c7302747029450e22279c.zip | |
Merge branch 'core/xen' into x86/xen
Diffstat (limited to 'include/linux/net.h')
| -rw-r--r-- | include/linux/net.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/include/linux/net.h b/include/linux/net.h index 4a9a30f2d68..6dc14a24004 100644 --- a/include/linux/net.h +++ b/include/linux/net.h @@ -18,16 +18,9 @@ #ifndef _LINUX_NET_H #define _LINUX_NET_H -#include <linux/wait.h> #include <linux/socket.h> -#include <linux/fcntl.h> /* For O_CLOEXEC and O_NONBLOCK */ #include <asm/socket.h> -struct poll_table_struct; -struct pipe_inode_info; -struct inode; -struct net; - #define NPROTO AF_MAX #define SYS_SOCKET 1 /* sys_socket(2) */ @@ -62,6 +55,13 @@ typedef enum { #ifdef __KERNEL__ #include <linux/stringify.h> #include <linux/random.h> +#include <linux/wait.h> +#include <linux/fcntl.h> /* For O_CLOEXEC and O_NONBLOCK */ + +struct poll_table_struct; +struct pipe_inode_info; +struct inode; +struct net; #define SOCK_ASYNC_NOSPACE 0 #define SOCK_ASYNC_WAITDATA 1 |