Merge branch 'kvm-updates/3.2' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm

[firefly-linux-kernel-4.4.55.git] / include / linux / x25.h

diff --git a/include/linux/x25.h b/include/linux/x25.h
index 6450a7f120740ff8503bb36de5fc8ce66d706ea4..810cce6737ea91649daaec069555fb267afd80f6 100644 (file)
--- a/include/linux/x25.h
+++ b/include/linux/x25.h
@@ -12,6 +12,7 @@
 #define        X25_KERNEL_H
 
 #include <linux/types.h>
+#include <linux/socket.h>
 
 #define        SIOCX25GSUBSCRIP        (SIOCPROTOPRIVATE + 0)
 #define        SIOCX25SSUBSCRIP        (SIOCPROTOPRIVATE + 1)
@@ -57,7 +58,7 @@ struct x25_address {
  *     Linux X.25 Address structure, used for bind, and connect mostly.
  */
 struct sockaddr_x25 {
-       sa_family_t        sx25_family;         /* Must be AF_X25 */
+       __kernel_sa_family_t sx25_family;       /* Must be AF_X25 */
        struct x25_address sx25_addr;           /* X.121 Address */
 };