summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-05-26 21:09:33 -0700
committerDavid S. Miller <davem@davemloft.net>2009-05-26 21:09:33 -0700
commit0e53c7f954a1e616df74723630dc844c211f6be5 (patch)
treec2b024eb46f4b8328457e8871363d239ed7efd49
parent2b0cc7f78ba55e831c16fb8cb5c204d9d2ecc398 (diff)
downloadlinux-stable-0e53c7f954a1e616df74723630dc844c211f6be5.tar.gz
linux-stable-0e53c7f954a1e616df74723630dc844c211f6be5.tar.bz2
linux-stable-0e53c7f954a1e616df74723630dc844c211f6be5.zip
ixp4xx_eth: Remove references to BUS_ID_SIZE.
Use MII_BUS_ID_SIZE instead. Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/arm/ixp4xx_eth.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/arm/ixp4xx_eth.c b/drivers/net/arm/ixp4xx_eth.c
index a740053d3af3..322c49b908dc 100644
--- a/drivers/net/arm/ixp4xx_eth.c
+++ b/drivers/net/arm/ixp4xx_eth.c
@@ -1149,7 +1149,7 @@ static int __devinit eth_init_one(struct platform_device *pdev)
struct net_device *dev;
struct eth_plat_info *plat = pdev->dev.platform_data;
u32 regs_phys;
- char phy_id[BUS_ID_SIZE];
+ char phy_id[MII_BUS_ID_SIZE + 3];
int err;
if (!(dev = alloc_etherdev(sizeof(struct port))))
@@ -1207,7 +1207,7 @@ static int __devinit eth_init_one(struct platform_device *pdev)
__raw_writel(DEFAULT_CORE_CNTRL, &port->regs->core_control);
udelay(50);
- snprintf(phy_id, BUS_ID_SIZE, PHY_ID_FMT, "0", plat->phy);
+ snprintf(phy_id, MII_BUS_ID_SIZE + 3, PHY_ID_FMT, "0", plat->phy);
port->phydev = phy_connect(dev, phy_id, &ixp4xx_adjust_link, 0,
PHY_INTERFACE_MODE_MII);
if ((err = IS_ERR(port->phydev)))