Merge branch 'viafb-next' of git://github.com/schandinat/linux-2.6

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

diff --git a/include/linux/atmarp.h b/include/linux/atmarp.h
index 24f82338f59a7584b392a85534cab74c5d828cad..231f4bdec730e2df575f8a99f9f1906d3ac012fd 100644 (file)
--- a/include/linux/atmarp.h
+++ b/include/linux/atmarp.h
@@ -6,9 +6,7 @@
 #ifndef _LINUX_ATMARP_H
 #define _LINUX_ATMARP_H
 
-#ifdef __KERNEL__
 #include <linux/types.h>
-#endif
 #include <linux/atmapi.h>
 #include <linux/atmioc.h>
 
@@ -37,7 +35,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