Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...

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

diff --git a/net/sysctl_net.c b/net/sysctl_net.c
index 58a1b6b42dddba6c85c10330bacdb48f7438e4f4..cd4eafbab1b8e265b70657033cc9a1047a16bce2 100644 (file)
--- a/net/sysctl_net.c
+++ b/net/sysctl_net.c
@@ -12,7 +12,6 @@
  *
  */
 
-#include <linux/config.h>
 #include <linux/mm.h>
 #include <linux/sysctl.h>