| commit | ef333696535c8bf1a714cde855e2d0926c6cc57d | [log] [tgz] |
|---|---|---|
| author | Wolfgang Denk <wd@denx.de> | Fri Sep 12 15:24:54 2008 +0200 |
| committer | Wolfgang Denk <wd@denx.de> | Fri Sep 12 15:24:54 2008 +0200 |
| tree | a7468c1a17feaf28d8ef3443fe5b6f544ecddb72 | |
| parent | 818968ccc4d2f9ab2570dab1e81194cf471706b1 [diff] | |
| parent | 35f9f94c2f2b125e884b7b5d06b4a15f83ffe802 [diff] |
Merge branch 'master' of /home/wd/git/u-boot/custodians
diff --git a/drivers/net/mpc512x_fec.c b/drivers/net/mpc512x_fec.c index 54283fb..7078c4e 100644 --- a/drivers/net/mpc512x_fec.c +++ b/drivers/net/mpc512x_fec.c
@@ -364,7 +364,7 @@ /* * Wait for AN completion */ - timeout = 50000; + timeout = 2500; do { udelay (1000);