diff options
| author | David S. Miller <davem@davemloft.net> | 2010-06-26 10:27:00 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-06-26 10:27:00 -0700 |
| commit | c67dda14389205f0a223c5089307495290939b3b (patch) | |
| tree | fad0bb26b28703d02a22ebdd44d94eabac4a2ade /drivers/net/fs_enet/mii-bitbang.c | |
| parent | 43bc2db47292a824152145253b1dd2847e7312a3 (diff) | |
| parent | 7e27d6e778cd87b6f2415515d7127eba53fe5d02 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'drivers/net/fs_enet/mii-bitbang.c')
| -rw-r--r-- | drivers/net/fs_enet/mii-bitbang.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/fs_enet/mii-bitbang.c b/drivers/net/fs_enet/mii-bitbang.c index 0f90685d3d19..3607340f3da7 100644 --- a/drivers/net/fs_enet/mii-bitbang.c +++ b/drivers/net/fs_enet/mii-bitbang.c @@ -169,7 +169,7 @@ static int __devinit fs_enet_mdio_probe(struct of_device *ofdev, new_bus->name = "CPM2 Bitbanged MII", - ret = fs_mii_bitbang_init(new_bus, ofdev->node); + ret = fs_mii_bitbang_init(new_bus, ofdev->dev.of_node); if (ret) goto out_free_bus; @@ -181,7 +181,7 @@ static int __devinit fs_enet_mdio_probe(struct of_device *ofdev, new_bus->parent = &ofdev->dev; dev_set_drvdata(&ofdev->dev, new_bus); - ret = of_mdiobus_register(new_bus, ofdev->node); + ret = of_mdiobus_register(new_bus, ofdev->dev.of_node); if (ret) goto out_free_irqs; |