diff options
| author | John W. Linville <linville@tuxdriver.com> | 2006-06-05 20:42:27 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-06-05 20:42:27 +0200 |
| commit | dea58b80f2625d3712645fb6ff0af45866cedaae (patch) | |
| tree | b9c0d4f7d4fcd90e438b5cc5d05471e52615a62d /include/net | |
| parent | Merge branch 'upstream-fixes' into upstream (diff) | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6 (diff) | |
| download | linux-dea58b80f2625d3712645fb6ff0af45866cedaae.tar.xz linux-dea58b80f2625d3712645fb6ff0af45866cedaae.zip | |
Merge branch 'from-linus' into upstream
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/compat.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/net/compat.h b/include/net/compat.h index 8662b8f43df5..e65cbedb6abc 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) */ |