From d19dc77c20ee92d5479ba81bafa6392943592613 Mon Sep 17 00:00:00 2001 From: Florian Fainelli Date: Mon, 9 Jan 2012 23:59:13 +0000 Subject: [PATCH] --- yaml --- r: 284290 b: refs/heads/master c: 391420f7b829e73b26a543e39c40a83f7de6467c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/freescale/fec.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index ba7f295eba5b..a3137c7bafcf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 63f678301fb952c2d758d9ded4ed88c1da6c0c50 +refs/heads/master: 391420f7b829e73b26a543e39c40a83f7de6467c diff --git a/trunk/drivers/net/ethernet/freescale/fec.c b/trunk/drivers/net/ethernet/freescale/fec.c index ddcbbb34d1b9..236cc892ec3e 100644 --- a/trunk/drivers/net/ethernet/freescale/fec.c +++ b/trunk/drivers/net/ethernet/freescale/fec.c @@ -1077,7 +1077,8 @@ static int fec_enet_mii_init(struct platform_device *pdev) fep->mii_bus->read = fec_enet_mdio_read; fep->mii_bus->write = fec_enet_mdio_write; fep->mii_bus->reset = fec_enet_mdio_reset; - snprintf(fep->mii_bus->id, MII_BUS_ID_SIZE, "%x", fep->dev_id + 1); + snprintf(fep->mii_bus->id, MII_BUS_ID_SIZE, "%s-%x", + pdev->name, fep->dev_id + 1); fep->mii_bus->priv = fep; fep->mii_bus->parent = &pdev->dev;