apfs/linux-apfs
0
0
Fork 0
mirror of https://github.com/linux-apfs/linux-apfs.git synced 2026-05-01 15:00:59 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'gcl/merge' into next

Browse Source 
Manual merge of:
	drivers/net/fec_mpc52xx.c
This commit is contained in:
Benjamin Herrenschmidt
2009-06-18 11:22:08 +10:00
parent 4b337c5f24 e7c5a4f292
commit b71a107c66
18 changed files with 91 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/net/fec_mpc52xx_phy.c
+1 -1
View File
@@ -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)