diff options
author | Wolfgang Denk <wd@pollux.(none)> | 2005-12-01 01:38:13 +0100 |
---|---|---|
committer | Wolfgang Denk <wd@pollux.(none)> | 2005-12-01 01:38:13 +0100 |
commit | 4a86d779ff0b2bf9690e50786dece5a689ba3345 (patch) | |
tree | 3746d8406d5144dc02ef972e69e7c772706f26ca /net/eth.c | |
parent | b6f8435664db077235be537b64a67d03bd235c32 (diff) | |
parent | d96f41e0165f1bdc16eacf79ba1654c8f45fa71a (diff) | |
download | u-boot-imx-4a86d779ff0b2bf9690e50786dece5a689ba3345.zip u-boot-imx-4a86d779ff0b2bf9690e50786dece5a689ba3345.tar.gz u-boot-imx-4a86d779ff0b2bf9690e50786dece5a689ba3345.tar.bz2 |
Merge with /home/sr/git/u-boot
Diffstat (limited to 'net/eth.c')
-rw-r--r-- | net/eth.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -162,9 +162,6 @@ int eth_initialize(bd_t *bis) #ifdef SCC_ENET scc_initialize(bis); #endif -#if defined(FEC_ENET) || defined(CONFIG_ETHER_ON_FCC) - fec_initialize(bis); -#endif #if defined(CONFIG_MPC5xxx_FEC) mpc5xxx_fec_initialize(bis); #endif @@ -198,6 +195,9 @@ int eth_initialize(bd_t *bis) tsec_initialize(bis, 3, CONFIG_MPC83XX_TSEC4_NAME); # endif #endif +#if defined(FEC_ENET) || defined(CONFIG_ETHER_ON_FCC) + fec_initialize(bis); +#endif #if defined(CONFIG_AU1X00) au1x00_enet_initialize(bis); #endif |