diff --git a/[refs] b/[refs] index 5e173cbd4f5d..83823ea1c846 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d98a80f5b69ef3e1127912a002e5f681fbeacfdf +refs/heads/master: b07812f15e396001b0d0949902d8d633596b093f diff --git a/trunk/drivers/net/ethernet/marvell/mvmdio.c b/trunk/drivers/net/ethernet/marvell/mvmdio.c index 114a0f14244a..6d6002bab060 100644 --- a/trunk/drivers/net/ethernet/marvell/mvmdio.c +++ b/trunk/drivers/net/ethernet/marvell/mvmdio.c @@ -42,8 +42,7 @@ struct orion_mdio_dev { void __iomem *smireg; }; -/* - * Wait for the SMI unit to be ready for another operation +/* Wait for the SMI unit to be ready for another operation */ static int orion_mdio_wait_ready(struct mii_bus *bus) {