Merge master.kernel.org:/home/rmk/linux-2.6-i2c manually

[pandora-kernel.git] / include / linux / socket.h

diff --git a/include/linux/socket.h b/include/linux/socket.h
index acc55aa..1739c2d 100644 (file)
--- a/include/linux/socket.h
+++ b/include/linux/socket.h
@@ -26,6 +26,13 @@ struct __kernel_sockaddr_storage {
 #include <linux/types.h>               /* pid_t                        */
 #include <linux/compiler.h>            /* __user                       */
 
+extern int sysctl_somaxconn;
+extern void sock_init(void);
+#ifdef CONFIG_PROC_FS
+struct seq_file;
+extern void socket_seq_show(struct seq_file *seq);
+#endif
+
 typedef unsigned short sa_family_t;
 
 /*