From f9c9deae0cee58082c64d55dfb95643cc590c113 Mon Sep 17 00:00:00 2001
From: Peter Ujfalusi <peter.ujfalusi@ti.com>
Date: Wed, 19 Dec 2012 10:50:09 +0100
Subject: [PATCH] --- yaml --- r: 347766 b: refs/heads/master c:
 2727da8595d6a134502ce576b812f0bb0e3c14ed h: refs/heads/master v: v3

---
 [refs]                            | 2 +-
 trunk/arch/arm/mach-omap2/timer.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index c9f705878e05..7147534ef69e 100644
--- 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
index 06e141543623..691aa674665a 100644
--- 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;
 	}