linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / include / net / compat.h

diff --git a/include/net/compat.h b/include/net/compat.h
index 9859b60..290bab4 100644 (file)
--- a/include/net/compat.h
+++ b/include/net/compat.h
@@ -1,8 +1,7 @@
 #ifndef NET_COMPAT_H
 #define NET_COMPAT_H
 
-
-struct sock;
+#include <linux/config.h>
 
 #if defined(CONFIG_COMPAT)
 
@@ -24,8 +23,6 @@ struct compat_cmsghdr {
        compat_int_t    cmsg_type;
 };
 
-extern int compat_sock_get_timestamp(struct sock *, struct timeval __user *);
-
 #else /* defined(CONFIG_COMPAT) */
 #define compat_msghdr  msghdr          /* to avoid compiler warnings */
 #endif /* defined(CONFIG_COMPAT) */
@@ -37,6 +34,7 @@ extern asmlinkage long compat_sys_recvmsg(int,struct compat_msghdr __user *,unsi
 extern asmlinkage long compat_sys_getsockopt(int, int, int, char __user *, int __user *);
 extern int put_cmsg_compat(struct msghdr*, int, int, int, void *);
 
+struct sock;
 extern int cmsghdr_from_user_compat_to_kern(struct msghdr *, struct sock *, unsigned char *, int);
 
 #endif /* NET_COMPAT_H */