Merge branch 'master' into upstream

[powerpc.git] / include / linux / atmarp.h

diff --git a/include/linux/atmarp.h b/include/linux/atmarp.h
index 24f8233..ee108f9 100644 (file)
--- a/include/linux/atmarp.h
+++ b/include/linux/atmarp.h
@@ -37,7 +37,7 @@ enum atmarp_ctrl_type {
 struct atmarp_ctrl {
        enum atmarp_ctrl_type   type;   /* message type */
        int                     itf_num;/* interface number (if present) */
-       uint32_t                ip;     /* IP address (act_need only) */
+       __be32                  ip;     /* IP address (act_need only) */
 };
 
 #endif