diff options
author | Wolfgang Denk <wd@denx.de> | 2009-06-15 11:15:54 +0200 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2009-06-15 11:15:54 +0200 |
commit | c9005a72fee4231e30fe93c1741cea2342c54504 (patch) | |
tree | 50ae6edb28698df98211f99a8178f06a8b7ab50f /net/eth.c | |
parent | 9ff67e5e4c719556d57f136a6453f8e4798d85c0 (diff) | |
parent | 60f61e6d7655400bb785a2ef637581679941f6d1 (diff) | |
download | u-boot-imx-c9005a72fee4231e30fe93c1741cea2342c54504.zip u-boot-imx-c9005a72fee4231e30fe93c1741cea2342c54504.tar.gz u-boot-imx-c9005a72fee4231e30fe93c1741cea2342c54504.tar.bz2 |
Merge branch 'master' of git://git.denx.de/u-boot-net
Diffstat (limited to 'net/eth.c')
-rw-r--r-- | net/eth.c | 8 |
1 files changed, 0 insertions, 8 deletions
@@ -501,10 +501,8 @@ char *eth_get_name (void) #elif defined(CONFIG_CMD_NET) && !defined(CONFIG_NET_MULTI) extern int at91rm9200_miiphy_initialize(bd_t *bis); -extern int emac4xx_miiphy_initialize(bd_t *bis); extern int mcf52x2_miiphy_initialize(bd_t *bis); extern int ns7520_miiphy_initialize(bd_t *bis); -extern int davinci_eth_miiphy_initialize(bd_t *bis); int eth_initialize(bd_t *bis) @@ -516,18 +514,12 @@ int eth_initialize(bd_t *bis) #if defined(CONFIG_AT91RM9200) at91rm9200_miiphy_initialize(bis); #endif -#if defined(CONFIG_PPC4xx_EMAC) - emac4xx_miiphy_initialize(bis); -#endif #if defined(CONFIG_MCF52x2) mcf52x2_miiphy_initialize(bis); #endif #if defined(CONFIG_DRIVER_NS7520_ETHERNET) ns7520_miiphy_initialize(bis); #endif -#if defined(CONFIG_DRIVER_TI_EMAC) - davinci_eth_miiphy_initialize(bis); -#endif return 0; } #endif |