diff options
| author |   Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-06-18 11:22:08 +1000 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-06-18 11:22:08 +1000 |
| commit | b71a107c66ad952c9d35ec046a803efc89a80556 (patch) | |
| tree | eb1f77af4f14974ba40a413d7679b3a451295a3d /drivers/net/fec_mpc52xx_phy.c | |
| parent | Merge commit 'origin/master' into next (diff) | |
| parent | powerpc/5121: make clock debug output more readable (diff) | |
| download | linux-dev-b71a107c66ad952c9d35ec046a803efc89a80556.tar.xz linux-dev-b71a107c66ad952c9d35ec046a803efc89a80556.zip | |
Merge commit 'gcl/merge' into next
Manual merge of:
drivers/net/fec_mpc52xx.c
Diffstat (limited to 'drivers/net/fec_mpc52xx_phy.c')
| -rw-r--r-- | drivers/net/fec_mpc52xx_phy.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/fec_mpc52xx_phy.c b/drivers/net/fec_mpc52xx_phy.c index fec9f245116b..31e6d62b785d 100644 --- a/drivers/net/fec_mpc52xx_phy.c +++ b/drivers/net/fec_mpc52xx_phy.c @@ -106,7 +106,7 @@ static int mpc52xx_fec_mdio_probe(struct of_device *of, /* set MII speed */ out_be32(&priv->regs->mii_speed, - ((mpc52xx_find_ipb_freq(of->node) >> 20) / 5) << 1); + ((mpc5xxx_get_bus_frequency(of->node) >> 20) / 5) << 1); err = of_mdiobus_register(bus, np); if (err) |