Merge branch 'from-linus' into upstream

2006-06-05 14:42:27 -04:00
parent b1141f6d5d 672c6108a5
commit dea58b80f2
130 changed files with 1730 additions and 1238 deletions
@@ -3,6 +3,8 @@

 #include <linux/config.h>

+struct sock;
+
 #if defined(CONFIG_COMPAT)

 #include <linux/compat.h>
@@ -23,7 +25,6 @@ struct compat_cmsghdr {
 	compat_int_t	cmsg_type;
 };

-struct sock;
 extern int compat_sock_get_timestamp(struct sock *, struct timeval __user *);

 #else /* defined(CONFIG_COMPAT) */