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

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

diff --git a/net/ipv6/inet6_connection_sock.c b/net/ipv6/inet6_connection_sock.c
index 5624f373164dd22fd64340a1bbdf6bfa83d6700f..5c950cc79d80a3c04384b8238e2573e9f827fdb5 100644 (file)
--- a/net/ipv6/inet6_connection_sock.c
+++ b/net/ipv6/inet6_connection_sock.c
@@ -13,7 +13,6 @@
  *             2 of the License, or(at your option) any later version.
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/in6.h>
 #include <linux/ipv6.h>