aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/atalk.h
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2005-04-16 15:24:09 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-04-16 15:24:09 -0700
commit9f3786dc8b1d6229dbe76e364323f0d787e7a0ea (patch)
tree9becf7cb07d0bcd3fa638b66e389f9cd6ed6d52a /include/linux/atalk.h
parent4c4c402d6caba5d938ffbbb49961659ecac709d4 (diff)
downloadkernel_samsung_aries-9f3786dc8b1d6229dbe76e364323f0d787e7a0ea.zip
kernel_samsung_aries-9f3786dc8b1d6229dbe76e364323f0d787e7a0ea.tar.gz
kernel_samsung_aries-9f3786dc8b1d6229dbe76e364323f0d787e7a0ea.tar.bz2
[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.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/atalk.h b/include/linux/atalk.h
index 55fcfc1..31d3fc2 100644
--- a/include/linux/atalk.h
+++ b/include/linux/atalk.h
@@ -1,8 +1,6 @@
#ifndef __LINUX_ATALK_H__
#define __LINUX_ATALK_H__
-#include <net/sock.h>
-
/*
* AppleTalk networking structures
*
@@ -39,6 +37,10 @@ struct atalk_netrange {
__u16 nr_lastnet;
};
+#ifdef __KERNEL__
+
+#include <net/sock.h>
+
struct atalk_route {
struct net_device *dev;
struct atalk_addr target;
@@ -81,8 +83,6 @@ static inline struct atalk_sock *at_sk(struct sock *sk)
return (struct atalk_sock *)sk;
}
-#ifdef __KERNEL__
-
#include <asm/byteorder.h>
struct ddpehdr {