diff options
author | David S. Miller <davem@davemloft.net> | 2005-04-16 18:24:09 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-16 18:24:09 -0400 |
commit | 9f3786dc8b1d6229dbe76e364323f0d787e7a0ea (patch) | |
tree | 9becf7cb07d0bcd3fa638b66e389f9cd6ed6d52a /include/linux/atalk.h | |
parent | 4c4c402d6caba5d938ffbbb49961659ecac709d4 (diff) |
[PATCH] Fix linux/atalk.h header
This recently got changed to include a lot of kernel internal stuff in the
non-__KERNEL__ area of the header, which isn't so kosher and breaks libc
builds.
The fix is pretty simple.
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/linux/atalk.h')
-rw-r--r-- | include/linux/atalk.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/atalk.h b/include/linux/atalk.h index 55fcfc11fdc7..31d3fc25ccbd 100644 --- a/include/linux/atalk.h +++ b/include/linux/atalk.h | |||
@@ -1,8 +1,6 @@ | |||
1 | #ifndef __LINUX_ATALK_H__ | 1 | #ifndef __LINUX_ATALK_H__ |
2 | #define __LINUX_ATALK_H__ | 2 | #define __LINUX_ATALK_H__ |
3 | 3 | ||
4 | #include <net/sock.h> | ||
5 | |||
6 | /* | 4 | /* |
7 | * AppleTalk networking structures | 5 | * AppleTalk networking structures |
8 | * | 6 | * |
@@ -39,6 +37,10 @@ struct atalk_netrange { | |||
39 | __u16 nr_lastnet; | 37 | __u16 nr_lastnet; |
40 | }; | 38 | }; |
41 | 39 | ||
40 | #ifdef __KERNEL__ | ||
41 | |||
42 | #include <net/sock.h> | ||
43 | |||
42 | struct atalk_route { | 44 | struct atalk_route { |
43 | struct net_device *dev; | 45 | struct net_device *dev; |
44 | struct atalk_addr target; | 46 | struct atalk_addr target; |
@@ -81,8 +83,6 @@ static inline struct atalk_sock *at_sk(struct sock *sk) | |||
81 | return (struct atalk_sock *)sk; | 83 | return (struct atalk_sock *)sk; |
82 | } | 84 | } |
83 | 85 | ||
84 | #ifdef __KERNEL__ | ||
85 | |||
86 | #include <asm/byteorder.h> | 86 | #include <asm/byteorder.h> |
87 | 87 | ||
88 | struct ddpehdr { | 88 | struct ddpehdr { |