diff --git a/[refs] b/[refs]
index 26c85d3a7007..533848bbd4c8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9fe03bc3139503fbad66016bf714f4575babf651
+refs/heads/master: 7d7dc0d6b0565484e0623cb08b5dcdd56424697b
diff --git a/trunk/include/linux/socket.h b/trunk/include/linux/socket.h
index 20fc4bbfca42..afc01909a428 100644
--- a/trunk/include/linux/socket.h
+++ b/trunk/include/linux/socket.h
@@ -24,10 +24,12 @@ struct __kernel_sockaddr_storage {
 #include <linux/types.h>		/* pid_t			*/
 #include <linux/compiler.h>		/* __user			*/
 
-#ifdef CONFIG_PROC_FS
+#ifdef __KERNEL__
+# ifdef CONFIG_PROC_FS
 struct seq_file;
 extern void socket_seq_show(struct seq_file *seq);
-#endif
+# endif
+#endif /* __KERNEL__ */
 
 typedef unsigned short	sa_family_t;