Merge branch 'master' into upstream

[linux-2.6] / include / net / sock.h

diff --git a/include/net/sock.h b/include/net/sock.h
index 96565ff0de6aa46e08eb932a8a97b4c5da9f3451..d10dfecb6cbdd9cee17dda53cbbea251e36d7e52 100644 (file)
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -40,7 +40,6 @@
 #ifndef _SOCK_H
 #define _SOCK_H
 
-#include <linux/config.h>
 #include <linux/list.h>
 #include <linux/timer.h>
 #include <linux/cache.h>