summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorJohn Rigby <jrigby@freescale.com>2007-08-16 17:40:03 -0600
committerJohn Rigby <jrigby@freescale.com>2007-08-16 17:40:03 -0600
commit81735b2568cf634d601c0d4a1bbc3a3882bc8eda (patch)
tree521d22623e48f6923b4cda08a36cc26a9cc9abde /net
parentd35b508a55508535b6e8445b718585d27df733d3 (diff)
parentd61ea14885631e58a25feaa81ee82eb464c62d6a (diff)
downloadtalos-obmc-uboot-81735b2568cf634d601c0d4a1bbc3a3882bc8eda.tar.gz
talos-obmc-uboot-81735b2568cf634d601c0d4a1bbc3a3882bc8eda.zip
Merge branch 'denx-coldfire' into coldfire-aug2007
Diffstat (limited to 'net')
-rw-r--r--net/eth.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/net/eth.c b/net/eth.c
index c2c23f6f1c..e7f1220591 100644
--- a/net/eth.c
+++ b/net/eth.c
@@ -59,6 +59,7 @@ 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 mcffec_initialize(bd_t*);
static struct eth_device *eth_devices, *eth_current;
@@ -249,6 +250,9 @@ int eth_initialize(bd_t *bis)
#if defined(CONFIG_ATSTK1000)
atstk1000_eth_initialize(bis);
#endif
+#if defined(CONFIG_MCFFEC)
+ mcffec_initialize(bis);
+#endif
if (!eth_devices) {
puts ("No ethernet found.\n");
OpenPOWER on IntegriCloud