summaryrefslogtreecommitdiffstats
path: root/board/Marvell/db64460/db64460.c
diff options
context:
space:
mode:
authorMarek Vasut <marex@denx.de>2012-03-02 22:39:32 +0000
committerWolfgang Denk <wd@denx.de>2012-03-06 21:13:26 +0100
commit021f6038a233bc6a60edc4adc1819492fddff9ff (patch)
treefabe55ab81f61c2fa338a0748fbfc92c99dd9ca5 /board/Marvell/db64460/db64460.c
parent658c3b9eafd0167fd150f129c0720eb305efc225 (diff)
downloadblackbird-obmc-uboot-021f6038a233bc6a60edc4adc1819492fddff9ff.tar.gz
blackbird-obmc-uboot-021f6038a233bc6a60edc4adc1819492fddff9ff.zip
PPC: Drop mv6446x_eth_initialize() from net/eth.c
This function was defined as an extern in net/eth.c, drop that and use standard means of calling it. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Stefan Roese <sr@denx.de>
Diffstat (limited to 'board/Marvell/db64460/db64460.c')
-rw-r--r--board/Marvell/db64460/db64460.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/board/Marvell/db64460/db64460.c b/board/Marvell/db64460/db64460.c
index a7836edb4d..d4f58b3216 100644
--- a/board/Marvell/db64460/db64460.c
+++ b/board/Marvell/db64460/db64460.c
@@ -934,5 +934,9 @@ void board_prebootm_init ()
int board_eth_init(bd_t *bis)
{
- return pci_eth_init(bis);
+ int ret;
+ ret = pci_eth_init(bis);
+ if (!ret)
+ ret = mv6446x_eth_initialize(bis);
+ return ret;
}
OpenPOWER on IntegriCloud