diff --git a/[refs] b/[refs]
index 24c01e5dd640..186c1d7c31b7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fc8717baa8f52dd8d1b90df9008300ef3ec794ed
+refs/heads/master: 0098b7273e968fb9989a6e1e4e4c024cd081fe0d
diff --git a/trunk/include/linux/net.h b/trunk/include/linux/net.h
index c414d90e647b..71f7dd559285 100644
--- a/trunk/include/linux/net.h
+++ b/trunk/include/linux/net.h
@@ -19,6 +19,7 @@
 #define _LINUX_NET_H
 
 #include <linux/wait.h>
+#include <linux/socket.h>
 #include <asm/socket.h>
 
 struct poll_table_struct;
@@ -26,7 +27,7 @@ struct pipe_inode_info;
 struct inode;
 struct net;
 
-#define NPROTO		34		/* should be enough for now..	*/
+#define NPROTO		AF_MAX
 
 #define SYS_SOCKET	1		/* sys_socket(2)		*/
 #define SYS_BIND	2		/* sys_bind(2)			*/