From 36e5f42c78655cee0cc4abc63847ad944aba4958 Mon Sep 17 00:00:00 2001 From: Florian Fainelli Date: Mon, 9 Jan 2012 23:59:16 +0000 Subject: [PATCH] --- yaml --- r: 284293 b: refs/heads/master c: d073a102a185e9847785c93669bffd1a09a8c1f2 h: refs/heads/master i: 284291: 477885391f4ab2e94b3d2974cb0bc8de943f4a6d v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/marvell/pxa168_eth.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index d0c37618e791..6488a13804de 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 12322431d154250db9e61b0c79151c968a8d7766 +refs/heads/master: d073a102a185e9847785c93669bffd1a09a8c1f2 diff --git a/trunk/drivers/net/ethernet/marvell/pxa168_eth.c b/trunk/drivers/net/ethernet/marvell/pxa168_eth.c index 5ec409e3da09..953ba5851f7b 100644 --- a/trunk/drivers/net/ethernet/marvell/pxa168_eth.c +++ b/trunk/drivers/net/ethernet/marvell/pxa168_eth.c @@ -1552,7 +1552,8 @@ static int pxa168_eth_probe(struct platform_device *pdev) pep->smi_bus->name = "pxa168_eth smi"; pep->smi_bus->read = pxa168_smi_read; pep->smi_bus->write = pxa168_smi_write; - snprintf(pep->smi_bus->id, MII_BUS_ID_SIZE, "%d", pdev->id); + snprintf(pep->smi_bus->id, MII_BUS_ID_SIZE, "%s-%d", + pdev->name, pdev->id); pep->smi_bus->parent = &pdev->dev; pep->smi_bus->phy_mask = 0xffffffff; err = mdiobus_register(pep->smi_bus);