summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2015-12-04 17:50:34 -0500
committerTom Rini <trini@konsulko.com>2015-12-04 17:50:34 -0500
commit9eed48c8bec98425dbd995dd72c40e9ad7a8c26b (patch)
tree187374b183ff589b43b7f8706829500ad2664dc2 /drivers
parenta85670e40da1ef4f299effb73c36e48d39d50106 (diff)
parent7a4fb11b85939b47738283c3a7ae7f461468e274 (diff)
downloadblackbird-obmc-uboot-9eed48c8bec98425dbd995dd72c40e9ad7a8c26b.tar.gz
blackbird-obmc-uboot-9eed48c8bec98425dbd995dd72c40e9ad7a8c26b.zip
Merge branch 'master' of http://git.denx.de/u-boot-sparc
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/greth.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/greth.c b/drivers/net/greth.c
index 0624eb8cac..088cb229da 100644
--- a/drivers/net/greth.c
+++ b/drivers/net/greth.c
@@ -245,7 +245,7 @@ int greth_init_phy(greth_priv * dev, bd_t * bis)
debug("GRETH PHY ADDRESS: %d\n", phyaddr);
/* X msecs to ticks */
- timeout = usec2ticks(GRETH_PHY_TIMEOUT_MS * 1000);
+ timeout = GRETH_PHY_TIMEOUT_MS * 1000;
/* Get system timer0 current value
* Total timeout is 5s
OpenPOWER on IntegriCloud