From 16f5600755f1485c8efb7f1baacc9a959cb38e41 Mon Sep 17 00:00:00 2001
From: David Woodhouse <dwmw2@infradead.org>
Date: Tue, 25 Apr 2006 15:29:01 +0100
Subject: [PATCH] --- yaml --- r: 27972 b: refs/heads/master c:
 089f26d5e31b7bf42a9a8fefec08b30cd27f4b0e h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/include/linux/socket.h | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index aabd5f3b2050..c24ebd048685 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d85004eb15a635b3937e91d1dbadb1d37541983c
+refs/heads/master: 089f26d5e31b7bf42a9a8fefec08b30cd27f4b0e
diff --git a/trunk/include/linux/socket.h b/trunk/include/linux/socket.h
index 9ab2ddd80221..361409094649 100644
--- a/trunk/include/linux/socket.h
+++ b/trunk/include/linux/socket.h
@@ -18,8 +18,6 @@ struct __kernel_sockaddr_storage {
 
 #if defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2)
 
-#include <linux/config.h>		/* for CONFIG_COMPAT */
-#include <linux/linkage.h>
 #include <asm/socket.h>			/* arch-dependent defines	*/
 #include <linux/sockios.h>		/* the SIOCxxx I/O controls	*/
 #include <linux/uio.h>			/* iovec support		*/