diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-06-18 01:22:08 (GMT) |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-06-18 01:22:08 (GMT) |
commit | b71a107c66ad952c9d35ec046a803efc89a80556 (patch) | |
tree | eb1f77af4f14974ba40a413d7679b3a451295a3d /drivers/net/fec_mpc52xx.c | |
parent | 4b337c5f245b6587ba844ac7bb13c313a2912f7b (diff) | |
parent | e7c5a4f292e0d1f4ba9a3a94b2c8e8b71e35b25a (diff) | |
download | linux-b71a107c66ad952c9d35ec046a803efc89a80556.tar.xz |
Merge commit 'gcl/merge' into next
Manual merge of:
drivers/net/fec_mpc52xx.c
Diffstat (limited to 'drivers/net/fec_mpc52xx.c')
-rw-r--r-- | drivers/net/fec_mpc52xx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/fec_mpc52xx.c b/drivers/net/fec_mpc52xx.c index 7d44340..cc78633 100644 --- a/drivers/net/fec_mpc52xx.c +++ b/drivers/net/fec_mpc52xx.c @@ -948,7 +948,7 @@ mpc52xx_fec_probe(struct of_device *op, const struct of_device_id *match) /* Start with safe defaults for link connection */ priv->speed = 100; priv->duplex = DUPLEX_HALF; - priv->mdio_speed = ((mpc52xx_find_ipb_freq(op->node) >> 20) / 5) << 1; + priv->mdio_speed = ((mpc5xxx_get_bus_frequency(op->node) >> 20) / 5) << 1; /* The current speed preconfigures the speed of the MII link */ prop = of_get_property(op->node, "current-speed", &prop_size); |