diff options
| author | David S. Miller <davem@davemloft.net> | 2011-02-22 13:15:59 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-02-22 13:15:59 -0500 |
| commit | 04cfa852ff8dab923640500ee850d19e75bacabc (patch) | |
| tree | e773a4d60de7c088ee6ab5ef87d35c7572a0a7ba | |
| parent | dc19e4e5e02fb6b46cccb08b2735e38b997a6ddf (diff) | |
| parent | 9721dbb375a9db5f7f430601b7ec0393e1c59f82 (diff) | |
Merge branch 'fec' of git://git.pengutronix.de/git/ukl/linux-2.6
| -rw-r--r-- | drivers/net/fec.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/fec.c b/drivers/net/fec.c index 74798bee672e..634c0daeecec 100644 --- a/drivers/net/fec.c +++ b/drivers/net/fec.c | |||
| @@ -983,8 +983,6 @@ static int fec_enet_mii_init(struct platform_device *pdev) | |||
| 983 | for (i = 0; i < PHY_MAX_ADDR; i++) | 983 | for (i = 0; i < PHY_MAX_ADDR; i++) |
| 984 | fep->mii_bus->irq[i] = PHY_POLL; | 984 | fep->mii_bus->irq[i] = PHY_POLL; |
| 985 | 985 | ||
| 986 | platform_set_drvdata(ndev, fep->mii_bus); | ||
| 987 | |||
| 988 | if (mdiobus_register(fep->mii_bus)) | 986 | if (mdiobus_register(fep->mii_bus)) |
| 989 | goto err_out_free_mdio_irq; | 987 | goto err_out_free_mdio_irq; |
| 990 | 988 | ||