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

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

diff --git a/net/eth.c b/net/eth.c
index 7fc9aee..8e83b66 100644 (file)
--- a/net/eth.c
+++ b/net/eth.c
@@ -69,9 +69,7 @@ extern int uli526x_initialize(bd_t *);
 extern int npe_initialize(bd_t *);
 extern int uec_initialize(int);
 extern int bfin_EMAC_initialize(bd_t *);
-extern int atstk1000_eth_initialize(bd_t *);
 extern int greth_initialize(bd_t *);
-extern int atngw100_eth_initialize(bd_t *);
 extern int mcffec_initialize(bd_t*);
 extern int mcdmafec_initialize(bd_t*);
 extern int at91sam9_eth_initialize(bd_t *);
@@ -271,15 +269,9 @@ int eth_initialize(bd_t *bis)
 #if defined(CONFIG_BF537)
        bfin_EMAC_initialize(bis);
 #endif
-#if defined(CONFIG_ATSTK1000)
-       atstk1000_eth_initialize(bis);
-#endif
 #if defined(CONFIG_GRETH)
        greth_initialize(bis);
 #endif
-#if defined(CONFIG_ATNGW100)
-       atngw100_eth_initialize(bis);
-#endif
 #if defined(CONFIG_MCFFEC)
        mcffec_initialize(bis);
 #endif
@@ -627,7 +619,7 @@ int eth_initialize(bd_t *bis)
 #if defined(CONFIG_MCF52x2)
        mcf52x2_miiphy_initialize(bis);
 #endif
-#if defined(CONFIG_NETARM)
+#if defined(CONFIG_DRIVER_NS7520_ETHERNET)
        ns7520_miiphy_initialize(bis);
 #endif
 #if defined(CONFIG_DRIVER_TI_EMAC)