diff options
author | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-06-26 01:31:38 -0400 |
---|---|---|
committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-06-26 01:31:38 -0400 |
commit | 4854c7b27f0975a2b629f35ea3996d2968eb7c4f (patch) | |
tree | 4102bdb70289764a2058aff0f907b13d7cf0e0d1 /include/net/compat.h | |
parent | 3cbd5b32cb625f5c0f1b1476d154fac873dd49ce (diff) | |
parent | fcc18e83e1f6fd9fa6b333735bf0fcd530655511 (diff) |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/net/compat.h')
-rw-r--r-- | include/net/compat.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/net/compat.h b/include/net/compat.h index 8662b8f43df..9859b60280d 100644 --- a/include/net/compat.h +++ b/include/net/compat.h @@ -1,7 +1,8 @@ #ifndef NET_COMPAT_H #define NET_COMPAT_H -#include <linux/config.h> + +struct sock; #if defined(CONFIG_COMPAT) @@ -23,7 +24,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) */ |