diff options
| author | John W. Linville <linville@tuxdriver.com> | 2006-06-05 14:42:27 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-06-05 14:42:27 -0400 |
| commit | dea58b80f2625d3712645fb6ff0af45866cedaae (patch) | |
| tree | b9c0d4f7d4fcd90e438b5cc5d05471e52615a62d /include/net | |
| parent | b1141f6d5dead296adcabd4a1e8ea2b994e287cb (diff) | |
| parent | 672c6108a51bf559d19595d9f8193dfd81f0f752 (diff) | |
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 @@ | |||
| 3 | 3 | ||
| 4 | #include <linux/config.h> | 4 | #include <linux/config.h> |
| 5 | 5 | ||
| 6 | struct sock; | ||
| 7 | |||
| 6 | #if defined(CONFIG_COMPAT) | 8 | #if defined(CONFIG_COMPAT) |
| 7 | 9 | ||
| 8 | #include <linux/compat.h> | 10 | #include <linux/compat.h> |
| @@ -23,7 +25,6 @@ struct compat_cmsghdr { | |||
| 23 | compat_int_t cmsg_type; | 25 | compat_int_t cmsg_type; |
| 24 | }; | 26 | }; |
| 25 | 27 | ||
| 26 | struct sock; | ||
| 27 | extern int compat_sock_get_timestamp(struct sock *, struct timeval __user *); | 28 | extern int compat_sock_get_timestamp(struct sock *, struct timeval __user *); |
| 28 | 29 | ||
| 29 | #else /* defined(CONFIG_COMPAT) */ | 30 | #else /* defined(CONFIG_COMPAT) */ |