diff options
| author | David S. Miller <davem@davemloft.net> | 2008-04-17 17:13:13 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-04-17 17:13:13 -0400 |
| commit | 2e5a3eaca386ce026f240c7b21e5c4958fcea946 (patch) | |
| tree | 191cf2b340d008b711137ce8c40b27a3dadff8d5 /drivers/net/phy/fixed.c | |
| parent | 8c95b4773dd8d0415269ffad7301ef96d75be8ee (diff) | |
| parent | 36b30ea940bb88d88c90698e0e3d97a805ab5856 (diff) | |
Merge branch 'upstream-net26' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/phy/fixed.c')
| -rw-r--r-- | drivers/net/phy/fixed.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/phy/fixed.c b/drivers/net/phy/fixed.c index ca9b040f9ad9..4e07956a483b 100644 --- a/drivers/net/phy/fixed.c +++ b/drivers/net/phy/fixed.c | |||
| @@ -213,7 +213,7 @@ static int __init fixed_mdio_bus_init(void) | |||
| 213 | goto err_pdev; | 213 | goto err_pdev; |
| 214 | } | 214 | } |
| 215 | 215 | ||
| 216 | fmb->mii_bus.id = 0; | 216 | snprintf(fmb->mii_bus.id, MII_BUS_ID_SIZE, "0"); |
| 217 | fmb->mii_bus.name = "Fixed MDIO Bus"; | 217 | fmb->mii_bus.name = "Fixed MDIO Bus"; |
| 218 | fmb->mii_bus.dev = &pdev->dev; | 218 | fmb->mii_bus.dev = &pdev->dev; |
| 219 | fmb->mii_bus.read = &fixed_mdio_read; | 219 | fmb->mii_bus.read = &fixed_mdio_read; |