Merge remote-tracking branch 'l2-mtd/master'

[karo-tx-linux.git] / include / linux / atalk.h

diff --git a/include/linux/atalk.h b/include/linux/atalk.h
index d34c187432ed883e6bcb498c6d9299c68e68d118..f57c36881c4898b24d07897fec211ce03b45dbfa 100644 (file)
--- a/include/linux/atalk.h
+++ b/include/linux/atalk.h
@@ -3,6 +3,7 @@
 
 #include <linux/types.h>
 #include <asm/byteorder.h>
+#include <linux/socket.h>
 
 /*
  * AppleTalk networking structures
@@ -28,7 +29,7 @@ struct atalk_addr {
 };
 
 struct sockaddr_at {
-       sa_family_t       sat_family;
+       __kernel_sa_family_t sat_family;
        __u8              sat_port;
        struct atalk_addr sat_addr;
        char              sat_zero[8];