X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fnet%2Fpasemi_mac.c;h=bc7f3dee6e5b0934ba859d44f5e1882a71a14cd9;hb=9028780a3e6d2c3dd940e89b377765cca008b6df;hp=b8f976bd60fdd5ebe548e05ab477e041259bc812;hpb=e824f7836de25b1c2f659a2412d32227f1f68bcb;p=pandora-kernel.git

diff --git a/drivers/net/pasemi_mac.c b/drivers/net/pasemi_mac.c
index b8f976bd60fd..bc7f3dee6e5b 100644
--- a/drivers/net/pasemi_mac.c
+++ b/drivers/net/pasemi_mac.c
@@ -94,11 +94,11 @@ static int pasemi_get_mac_addr(struct pasemi_mac *mac)
 		return -ENOENT;
 	}
 
-	maddr = get_property(dn, "local-mac-address", NULL);
+	maddr = of_get_property(dn, "local-mac-address", NULL);
 
 	/* Fall back to mac-address for older firmware */
 	if (maddr == NULL)
-		maddr = get_property(dn, "mac-address", NULL);
+		maddr = of_get_property(dn, "mac-address", NULL);
 
 	if (maddr == NULL) {
 		dev_warn(&pdev->dev,
@@ -683,12 +683,12 @@ static int pasemi_mac_phy_init(struct net_device *dev)
 	int ret;
 
 	dn = pci_device_to_OF_node(mac->pdev);
-	ph = get_property(dn, "phy-handle", NULL);
+	ph = of_get_property(dn, "phy-handle", NULL);
 	if (!ph)
 		return -ENODEV;
 	phy_dn = of_find_node_by_phandle(*ph);
 
-	prop = get_property(phy_dn, "reg", NULL);
+	prop = of_get_property(phy_dn, "reg", NULL);
 	ret = of_address_to_resource(phy_dn->parent, 0, &r);
 	if (ret)
 		goto err;