Merge branch 'next' of git://git.denx.de/u-boot-mpc83xx

[u-boot] / include / net.h

diff --git a/include/net.h b/include/net.h
index 23fb947292ccf3e1e1b805e86c11ac75106f3107..5aedc17aa6dc36ea6600d2c24e3d011c9c140226 100644 (file)
--- a/include/net.h
+++ b/include/net.h
@@ -39,7 +39,7 @@
 #define PKTALIGN       ARCH_DMA_MINALIGN
 
 /* IPv4 addresses are always 32 bits in size */
-typedef u32            IPaddr_t;
+typedef __be32         IPaddr_t;
 
 
 /**
@@ -357,7 +357,7 @@ struct icmp_hdr {
                } echo;
                ulong   gateway;
                struct {
-                       ushort  __unused;
+                       ushort  unused;
                        ushort  mtu;
                } frag;
                uchar data[0];