summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2008-03-08 10:55:46 +0100
committerWolfgang Denk <wd@denx.de>2008-03-08 10:55:46 +0100
commit377151c8173ee64cfc3fdfb545b366c36d8ce3b2 (patch)
tree0ccfa0296c97df5a04ab192da8bfe2a0cc4f5be5 /drivers
parent1ac14d8ea8c8421cd3328da254a79f46d0d2dd96 (diff)
parent270fe261b7f9292800b2b3d1bf19ae7cbc880258 (diff)
Merge branch 'master' of git://www.denx.de/git/u-boot-mpc83xx
Diffstat (limited to 'drivers')
-rw-r--r--drivers/qe/uec_phy.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/qe/uec_phy.c b/drivers/qe/uec_phy.c
index cf9921b37f..a42701c59b 100644
--- a/drivers/qe/uec_phy.c
+++ b/drivers/qe/uec_phy.c
@@ -290,6 +290,7 @@ static int genmii_update_link (struct uec_mii_info *mii_info)
return 0;
}
+ i++;
udelay(1000); /* 1 ms */
status = phy_read(mii_info, PHY_BMSR);
}
@@ -577,7 +578,7 @@ void marvell_phy_interface_mode (struct eth_device *dev,
u16 status;
if (!uec->mii_info) {
- printf ("%s: the PHY not intialized\n", __FUNCTION__);
+ printf ("%s: the PHY not initialized\n", __FUNCTION__);
return;
}
mii_info = uec->mii_info;