summaryrefslogtreecommitdiff
path: root/net/eth.c
diff options
context:
space:
mode:
authorWolfgang Denk <wd@pollux.(none)>2005-12-01 01:38:13 +0100
committerWolfgang Denk <wd@pollux.(none)>2005-12-01 01:38:13 +0100
commit4a86d779ff0b2bf9690e50786dece5a689ba3345 (patch)
tree3746d8406d5144dc02ef972e69e7c772706f26ca /net/eth.c
parentb6f8435664db077235be537b64a67d03bd235c32 (diff)
parentd96f41e0165f1bdc16eacf79ba1654c8f45fa71a (diff)
downloadu-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.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/eth.c b/net/eth.c
index 1646111..9341e20 100644
--- a/net/eth.c
+++ b/net/eth.c
@@ -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