From c1c9ed283c6d3b30955c3924c205cd330d2d754e Mon Sep 17 00:00:00 2001 From: Florian Fainelli Date: Mon, 9 Jan 2012 23:59:08 +0000 Subject: [PATCH] --- yaml --- r: 284285 b: refs/heads/master c: 75432fd2913e03696f56289a853754ef0124545f h: refs/heads/master i: 284283: 01d2f0a79a306e049f172eb43bde32de1ad46c5d v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/adi/bfin_mac.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 257817a04eb2..952afe75f8b2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fa84e7201c592945b390fb51a5ffc7e785868be4 +refs/heads/master: 75432fd2913e03696f56289a853754ef0124545f diff --git a/trunk/drivers/net/ethernet/adi/bfin_mac.c b/trunk/drivers/net/ethernet/adi/bfin_mac.c index b6d69c91db96..d812a103e032 100644 --- a/trunk/drivers/net/ethernet/adi/bfin_mac.c +++ b/trunk/drivers/net/ethernet/adi/bfin_mac.c @@ -1670,7 +1670,8 @@ static int __devinit bfin_mii_bus_probe(struct platform_device *pdev) miibus->name = "bfin_mii_bus"; miibus->phy_mask = mii_bus_pd->phy_mask; - snprintf(miibus->id, MII_BUS_ID_SIZE, "0"); + snprintf(miibus->id, MII_BUS_ID_SIZE, "%s-%x", + pdev->name, pdev->id); miibus->irq = kmalloc(sizeof(int)*PHY_MAX_ADDR, GFP_KERNEL); if (!miibus->irq) goto out_err_irq_alloc;