summaryrefslogtreecommitdiffstats
path: root/include/net
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2006-06-05 14:42:27 -0400
committerJohn W. Linville <linville@tuxdriver.com>2006-06-05 14:42:27 -0400
commitdea58b80f2625d3712645fb6ff0af45866cedaae (patch)
treeb9c0d4f7d4fcd90e438b5cc5d05471e52615a62d /include/net
parentb1141f6d5dead296adcabd4a1e8ea2b994e287cb (diff)
parent672c6108a51bf559d19595d9f8193dfd81f0f752 (diff)
Merge branch 'from-linus' into upstream
Diffstat (limited to 'include/net')
-rw-r--r--include/net/compat.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/net/compat.h b/include/net/compat.h
index 8662b8f43df..e65cbedb6ab 100644
--- a/include/net/compat.h
+++ b/include/net/compat.h
@@ -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) */