diff options
| author | Minkyu Kang <mk7.kang@samsung.com> | 2010-03-23 19:09:13 +0900 |
|---|---|---|
| committer | Minkyu Kang <mk7.kang@samsung.com> | 2010-03-23 19:09:13 +0900 |
| commit | 45e565337a90bbca0c1bb712b5e008b7c0b18bd5 (patch) | |
| tree | 8bcaee16cda9d8f90f5b596566ad2122c6d8d86b /common/miiphyutil.c | |
| parent | 995a4b1d83a08223c82c1e15778b02e85e5bba51 (diff) | |
| parent | d650da2dd4af99967aabc43cccbd8f160eb4cea6 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Conflicts:
cpu/arm920t/ep93xx/timer.c
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
Diffstat (limited to 'common/miiphyutil.c')
| -rw-r--r-- | common/miiphyutil.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/common/miiphyutil.c b/common/miiphyutil.c index 856fbc70b84..4b186dd28c0 100644 --- a/common/miiphyutil.c +++ b/common/miiphyutil.c @@ -377,7 +377,7 @@ int miiphy_speed (char *devname, unsigned char addr) /* Get speed from basic control settings. */ return (bmcr & PHY_BMCR_100MB) ? _100BASET : _10BASET; - miiphy_read_failed: +miiphy_read_failed: printf (" read failed, assuming 10BASE-T\n"); return _10BASET; } @@ -436,7 +436,7 @@ int miiphy_duplex (char *devname, unsigned char addr) /* Get speed from basic control settings. */ return (bmcr & PHY_BMCR_DPLX) ? FULL : HALF; - miiphy_read_failed: +miiphy_read_failed: printf (" read failed, assuming half duplex\n"); return HALF; } |