[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>

diff --git a/include/linux/atalk.h b/include/linux/atalk.h
index 55fcfc11fdc7b08d965870adb51f4c44c5889468..31d3fc25ccbd0efd1a4d45b5c2716db8999cd814 100644 (file)
--- 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 {