Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes

[pandora-kernel.git] / arch / powerpc / platforms / 82xx / ep8248e.c

diff --git a/arch/powerpc/platforms/82xx/ep8248e.c b/arch/powerpc/platforms/82xx/ep8248e.c
index f21555d..9f2e52b 100644 (file)
--- a/arch/powerpc/platforms/82xx/ep8248e.c
+++ b/arch/powerpc/platforms/82xx/ep8248e.c
@@ -119,12 +119,12 @@ static int __devinit ep8248e_mdio_probe(struct of_device *ofdev,
        struct device_node *node;
        int ret;
 
-       node = of_get_parent(ofdev->node);
+       node = of_get_parent(ofdev->dev.of_node);
        of_node_put(node);
        if (node != ep8248e_bcsr_node)
                return -ENODEV;
 
-       ret = of_address_to_resource(ofdev->node, 0, &res);
+       ret = of_address_to_resource(ofdev->dev.of_node, 0, &res);
        if (ret)
                return ret;
 
@@ -142,7 +142,7 @@ static int __devinit ep8248e_mdio_probe(struct of_device *ofdev,
        bus->parent = &ofdev->dev;
        snprintf(bus->id, MII_BUS_ID_SIZE, "%x", res.start);
 
-       ret = of_mdiobus_register(bus, ofdev->node);
+       ret = of_mdiobus_register(bus, ofdev->dev.of_node);
        if (ret)
                goto err_free_irq;
 
@@ -170,8 +170,9 @@ static const struct of_device_id ep8248e_mdio_match[] = {
 static struct of_platform_driver ep8248e_mdio_driver = {
        .driver = {
                .name = "ep8248e-mdio-bitbang",
+               .owner = THIS_MODULE,
+               .of_match_table = ep8248e_mdio_match,
        },
-       .match_table = ep8248e_mdio_match,
        .probe = ep8248e_mdio_probe,
        .remove = ep8248e_mdio_remove,
 };