summaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorDavid S. Miller2011-02-22 19:15:59 +0100
committerDavid S. Miller2011-02-22 19:15:59 +0100
commit04cfa852ff8dab923640500ee850d19e75bacabc (patch)
treee773a4d60de7c088ee6ab5ef87d35c7572a0a7ba /drivers/net
parentsh: sh_eth: Add support ethtool (diff)
parentnet/fec: remove unused driver data (diff)
downloadkernel-qcow2-linux-04cfa852ff8dab923640500ee850d19e75bacabc.tar.gz
kernel-qcow2-linux-04cfa852ff8dab923640500ee850d19e75bacabc.tar.xz
kernel-qcow2-linux-04cfa852ff8dab923640500ee850d19e75bacabc.zip
Merge branch 'fec' of git://git.pengutronix.de/git/ukl/linux-2.6
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/fec.c2
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)
for (i = 0; i < PHY_MAX_ADDR; i++)
fep->mii_bus->irq[i] = PHY_POLL;
- platform_set_drvdata(ndev, fep->mii_bus);
-
if (mdiobus_register(fep->mii_bus))
goto err_out_free_mdio_irq;