aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/arm
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/arm')
-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)
1149 struct net_device *dev; 1149 struct net_device *dev;
1150 struct eth_plat_info *plat = pdev->dev.platform_data; 1150 struct eth_plat_info *plat = pdev->dev.platform_data;
1151 u32 regs_phys; 1151 u32 regs_phys;
1152 char phy_id[BUS_ID_SIZE]; 1152 char phy_id[MII_BUS_ID_SIZE + 3];
1153 int err; 1153 int err;
1154 1154
1155 if (!(dev = alloc_etherdev(sizeof(struct port)))) 1155 if (!(dev = alloc_etherdev(sizeof(struct port))))
@@ -1207,7 +1207,7 @@ static int __devinit eth_init_one(struct platform_device *pdev)
1207 __raw_writel(DEFAULT_CORE_CNTRL, &port->regs->core_control); 1207 __raw_writel(DEFAULT_CORE_CNTRL, &port->regs->core_control);
1208 udelay(50); 1208 udelay(50);
1209 1209
1210 snprintf(phy_id, BUS_ID_SIZE, PHY_ID_FMT, "0", plat->phy); 1210 snprintf(phy_id, MII_BUS_ID_SIZE + 3, PHY_ID_FMT, "0", plat->phy);
1211 port->phydev = phy_connect(dev, phy_id, &ixp4xx_adjust_link, 0, 1211 port->phydev = phy_connect(dev, phy_id, &ixp4xx_adjust_link, 0,
1212 PHY_INTERFACE_MODE_MII); 1212 PHY_INTERFACE_MODE_MII);
1213 if ((err = IS_ERR(port->phydev))) 1213 if ((err = IS_ERR(port->phydev)))