Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6-omap-h63xx.git] / drivers / net / sh_eth.c

diff --git a/drivers/net/sh_eth.c b/drivers/net/sh_eth.c
index 1c370e6aa641d571467c4b4727e009bd8a01fd1c..b39d1cc1ef04b022537ded766f1490bdcb83a342 100644 (file)
--- a/drivers/net/sh_eth.c
+++ b/drivers/net/sh_eth.c
@@ -1140,7 +1140,7 @@ static int sh_mdio_init(struct net_device *ndev, int id)
 
        /* Hook up MII support for ethtool */
        mdp->mii_bus->name = "sh_mii";
-       mdp->mii_bus->dev = &ndev->dev;
+       mdp->mii_bus->parent = &ndev->dev;
        mdp->mii_bus->id[0] = id;
 
        /* PHY IRQ */
@@ -1166,7 +1166,7 @@ out_free_irq:
        kfree(mdp->mii_bus->irq);
 
 out_free_bus:
-       kfree(mdp->mii_bus);
+       free_mdio_bitbang(mdp->mii_bus);
 
 out_free_bitbang:
        kfree(bitbang);