diff --git a/[refs] b/[refs] index 2b4d5346ab47..f8477a08b925 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e44c39bd8478bf9e41cbc611c74b5879a7b29f58 +refs/heads/master: cb4db4c22182163f66325053331a4e7096f663cd diff --git a/trunk/include/linux/net.h b/trunk/include/linux/net.h index 6f0dfeba509a..f28d8a2e2c91 100644 --- a/trunk/include/linux/net.h +++ b/trunk/include/linux/net.h @@ -19,7 +19,6 @@ #define _LINUX_NET_H #include -#include #include struct poll_table_struct; @@ -57,6 +56,7 @@ typedef enum { #ifdef __KERNEL__ #include +#include #define SOCK_ASYNC_NOSPACE 0 #define SOCK_ASYNC_WAITDATA 1