Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[~andy/linux] / net / sysctl_net.c

diff --git a/net/sysctl_net.c b/net/sysctl_net.c
index c5241fcbb9662451918242557022da60ff003ca0..55538f6b60ffc56648687f9f72fd7d0ebafe6af3 100644 (file)
--- a/net/sysctl_net.c
+++ b/net/sysctl_net.c
@@ -16,6 +16,8 @@
 #include <linux/mm.h>
 #include <linux/sysctl.h>
 
+#include <net/sock.h>
+
 #ifdef CONFIG_INET
 #include <net/ip.h>
 #endif