diff options
| author | David S. Miller <davem@davemloft.net> | 2008-04-17 23:13:13 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-04-17 23:13:13 +0200 |
| commit | 2e5a3eaca386ce026f240c7b21e5c4958fcea946 (patch) | |
| tree | 191cf2b340d008b711137ce8c40b27a3dadff8d5 /drivers/net/macb.c | |
| parent | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville... (diff) | |
| parent | [netdrvr] forcedeth: internal simplifications; changelog removal (diff) | |
| download | linux-2e5a3eaca386ce026f240c7b21e5c4958fcea946.tar.xz linux-2e5a3eaca386ce026f240c7b21e5c4958fcea946.zip | |
Merge branch 'upstream-net26' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/macb.c')
| -rw-r--r-- | drivers/net/macb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/macb.c b/drivers/net/macb.c index 489c7c3b90d9..d513bb8a4902 100644 --- a/drivers/net/macb.c +++ b/drivers/net/macb.c @@ -246,7 +246,7 @@ static int macb_mii_init(struct macb *bp) bp->mii_bus.read = &macb_mdio_read; bp->mii_bus.write = &macb_mdio_write; bp->mii_bus.reset = &macb_mdio_reset; - bp->mii_bus.id = bp->pdev->id; + snprintf(bp->mii_bus.id, MII_BUS_ID_SIZE, "%x", bp->pdev->id); bp->mii_bus.priv = bp; bp->mii_bus.dev = &bp->dev->dev; pdata = bp->pdev->dev.platform_data; |