Merge 'next' branch

[platform/kernel/u-boot.git] / net / eth.c

diff --git a/net/eth.c b/net/eth.c
index f9a9957..ccd871a 100644 (file)
--- a/net/eth.c
+++ b/net/eth.c
@@ -40,8 +40,6 @@ int cpu_eth_init(bd_t *bis) __attribute((weak, alias("__def_eth_init")));
 int board_eth_init(bd_t *bis) __attribute((weak, alias("__def_eth_init")));
 
 extern int au1x00_enet_initialize(bd_t*);
-extern int dc21x4x_initialize(bd_t*);
-extern int eepro100_initialize(bd_t*);
 extern int fec_initialize(bd_t*);
 extern int mpc8220_fec_initialize(bd_t*);
 extern int mv6436x_eth_initialize(bd_t *);
@@ -182,6 +180,12 @@ int eth_initialize(bd_t *bis)
 #if defined(CONFIG_UEC_ETH4)
        uec_initialize(3);
 #endif
+#if defined(CONFIG_UEC_ETH5)
+       uec_initialize(4);
+#endif
+#if defined(CONFIG_UEC_ETH6)
+       uec_initialize(5);
+#endif
 
 #if defined(FEC_ENET) || defined(CONFIG_ETHER_ON_FCC)
        fec_initialize(bis);
@@ -192,12 +196,6 @@ int eth_initialize(bd_t *bis)
 #if defined(CONFIG_IXP4XX_NPE)
        npe_initialize(bis);
 #endif
-#ifdef CONFIG_EEPRO100
-       eepro100_initialize(bis);
-#endif
-#ifdef CONFIG_TULIP
-       dc21x4x_initialize(bis);
-#endif
        if (!eth_devices) {
                puts ("No ethernet found.\n");
                show_boot_progress (-64);