diff --git a/[refs] b/[refs]
index e02efbbfb7e7..0a4707050b6e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 10d33e9c36827e5371479e55ef4089e000af2638
+refs/heads/master: 596d3941035d4d4b484c820f10f57fd4816c6615
diff --git a/trunk/drivers/edac/mv64x60_edac.c b/trunk/drivers/edac/mv64x60_edac.c
index bf071f140a05..de69163ff5b3 100644
--- a/trunk/drivers/edac/mv64x60_edac.c
+++ b/trunk/drivers/edac/mv64x60_edac.c
@@ -612,7 +612,7 @@ static void get_total_mem(struct mv64x60_mc_pdata *pdata)
 	if (!np)
 		return;
 
-	reg = get_property(np, "reg", NULL);
+	reg = of_get_property(np, "reg", NULL);
 
 	pdata->total_mem = reg[1];
 }