summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorAlessandro Rubini <rubini@gnudd.com>2012-01-23 23:26:48 +0000
committerDavid S. Miller <davem@davemloft.net>2012-01-24 15:29:42 -0500
commit90b9a5454fd2e626aa1614fe9ece6b63a0dc37af (patch)
tree5803526775e8c15d398eb97d13b8345193e90b10 /drivers
parentedd664bbba53f771d4a6d4559ed6e1ff48b46406 (diff)
downloadlinux-3.10-90b9a5454fd2e626aa1614fe9ece6b63a0dc37af.tar.gz
linux-3.10-90b9a5454fd2e626aa1614fe9ece6b63a0dc37af.tar.bz2
linux-3.10-90b9a5454fd2e626aa1614fe9ece6b63a0dc37af.zip
stmmac: fix phy naming inconsistency
After commit "db8857b stmmac: use an unique MDIO bus name" my device stopped being probed because two different names were being used in different places. This fixes the inconsistency. Signed-off-by: Alessandro Rubini <rubini@gnudd.com> Acked-by: Giancarlo Asnaghi <giancarlo.asnaghi@st.com> Cc: Giuseppe Cavallaro <peppe.cavallaro@st.com> Cc: Florian Fainelli <florian@openwrt.org> Acked-by: Florian Fainelli <florian@openwrt.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
index da4a1042523..73195329aa4 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
@@ -154,7 +154,7 @@ int stmmac_mdio_register(struct net_device *ndev)
else
irqlist = priv->mii_irq;
- new_bus->name = "STMMAC MII Bus";
+ new_bus->name = "stmmac";
new_bus->read = &stmmac_mdio_read;
new_bus->write = &stmmac_mdio_write;
new_bus->reset = &stmmac_mdio_reset;