summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2012-01-09 23:59:07 +0000
committerDavid S. Miller <davem@davemloft.net>2012-01-10 16:35:00 -0800
commitfa84e7201c592945b390fb51a5ffc7e785868be4 (patch)
tree13091b56438081a04901708f7899f02515f96685 /drivers/net/ethernet
parent71bc5d94061516c4e70303570128797bcf768b10 (diff)
downloadtalos-obmc-linux-fa84e7201c592945b390fb51a5ffc7e785868be4.tar.gz
talos-obmc-linux-fa84e7201c592945b390fb51a5ffc7e785868be4.zip
ax88796: use an unique MDIO bus name.
Signed-off-by: Florian Fainelli <florian@openwrt.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet')
-rw-r--r--drivers/net/ethernet/8390/ax88796.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ethernet/8390/ax88796.c b/drivers/net/ethernet/8390/ax88796.c
index 9e8ba4f5636b..0f92e3567f68 100644
--- a/drivers/net/ethernet/8390/ax88796.c
+++ b/drivers/net/ethernet/8390/ax88796.c
@@ -623,7 +623,8 @@ static int ax_mii_init(struct net_device *dev)
ax->mii_bus->name = "ax88796_mii_bus";
ax->mii_bus->parent = dev->dev.parent;
- snprintf(ax->mii_bus->id, MII_BUS_ID_SIZE, "%x", pdev->id);
+ snprintf(ax->mii_bus->id, MII_BUS_ID_SIZE, "%s-%x",
+ pdev->name, pdev->id);
ax->mii_bus->irq = kmalloc(sizeof(int) * PHY_MAX_ADDR, GFP_KERNEL);
if (!ax->mii_bus->irq) {
OpenPOWER on IntegriCloud