diff --git a/[refs] b/[refs] index f889a9c7f5cb..edc05dcc24c0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b22dfb735a019a721117e713968c1ddf60ee6142 +refs/heads/master: 5770a3fb5f8544d40ae03b010318345cdd05d662 diff --git a/trunk/include/linux/net.h b/trunk/include/linux/net.h index 4a9a30f2d68f..6dc14a240042 100644 --- a/trunk/include/linux/net.h +++ b/trunk/include/linux/net.h @@ -18,16 +18,9 @@ #ifndef _LINUX_NET_H #define _LINUX_NET_H -#include #include -#include /* For O_CLOEXEC and O_NONBLOCK */ #include -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 #include +#include +#include /* 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