---

yaml --- r: 347766 b: refs/heads/master c: 2727da8 h: refs/heads/master v: v3
git-mirror · Dec 20, 2012 · f9c9dea · f9c9dea
1 parent 2e8ba62
commit f9c9dea
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f438a830fa21b14efe973500f482e39f793456fa
+refs/heads/master: 2727da8595d6a134502ce576b812f0bb0e3c14ed
diff --git a/trunk/arch/arm/mach-omap2/timer.c b/trunk/arch/arm/mach-omap2/timer.c
@@ -175,7 +175,7 @@ static struct device_node * __init omap_get_timer_dt(struct of_device_id *match,
 			continue;
 		}
 
-		prom_add_property(np, &device_disabled);
+		of_add_property(np, &device_disabled);
 		return np;
 	}