Merge branch 'master' of git://git.denx.de/u-boot-arm

[u-boot] / include / asm-m68k / u-boot.h

diff --git a/include/asm-m68k/u-boot.h b/include/asm-m68k/u-boot.h
index 5a0d5fe4877d05f00e42f4c23ae17e6518f128b2..a0f2983750f453d30b503e9b3d27e5289a445a0c 100644 (file)
--- a/include/asm-m68k/u-boot.h
+++ b/include/asm-m68k/u-boot.h
@@ -48,7 +48,6 @@ typedef struct bd_info {
        unsigned long bi_bootflags;     /* boot / reboot flag (for LynxOS) */
        unsigned long bi_boot_params;   /* where this board expects params */
        unsigned long bi_ip_addr;       /* IP Address */
-       unsigned char bi_enetaddr[6];   /* Ethernet adress */
        unsigned short bi_ethspeed;     /* Ethernet speed in Mbps */
        unsigned long bi_intfreq;       /* Internal Freq, in MHz */
        unsigned long bi_busfreq;       /* Bus Freq, in MHz */
@@ -61,18 +60,6 @@ typedef struct bd_info {
        unsigned long bi_flbfreq;       /* Flexbus Freq in MHz */
 #endif
        unsigned long bi_baudrate;      /* Console Baudrate */
-
-#ifdef CONFIG_HAS_ETH1
-       /* second onboard ethernet port */
-       unsigned char bi_enet1addr[6];
-#endif
-#ifdef CONFIG_HAS_ETH2
-       /* third onboard ethernet port */
-       unsigned char bi_enet2addr[6];
-#endif
-#ifdef CONFIG_HAS_ETH3
-       unsigned char bi_enet3addr[6];
-#endif
 } bd_t;
 
 #endif                         /* __ASSEMBLY__ */