Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh...

[pandora-kernel.git] / drivers / net / greth.c

diff --git a/drivers/net/greth.c b/drivers/net/greth.c
index fd491e4..f37a4c1 100644 (file)
--- a/drivers/net/greth.c
+++ b/drivers/net/greth.c
@@ -1499,7 +1499,8 @@ static int __devinit greth_of_probe(struct of_device *ofdev, const struct of_dev
        if (i == 6) {
                const unsigned char *addr;
                int len;
-               addr = of_get_property(ofdev->node, "local-mac-address", &len);
+               addr = of_get_property(ofdev->dev.of_node, "local-mac-address",
+                                       &len);
                if (addr != NULL && len == 6) {
                        for (i = 0; i < 6; i++)
                                macaddr[i] = (unsigned int) addr[i];