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

[linux-3.10.git] / net / ipv6 / af_inet6.c

diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c
index 0f26073117a3eb52e0ede9288c0d58e062a4a994..5a0ba58b86cc055845c74dba1ca8c6c0a47fdc31 100644 (file)
--- a/net/ipv6/af_inet6.c
+++ b/net/ipv6/af_inet6.c
@@ -23,7 +23,6 @@
 
 #include <linux/module.h>
 #include <linux/capability.h>
 
 #include <linux/module.h>
 #include <linux/capability.h>

-#include <linux/config.h>

 #include <linux/errno.h>
 #include <linux/types.h>
 #include <linux/socket.h>
 #include <linux/errno.h>
 #include <linux/types.h>
 #include <linux/socket.h>