From 132c8d73d8ae06c6487a84d3694262f6baf7f58e Mon Sep 17 00:00:00 2001
From: Jon Hunter <jon-hunter@ti.com>
Date: Tue, 29 Jan 2013 14:23:11 -0600
Subject: [PATCH] --- yaml --- r: 355109 b: refs/heads/master c:
 61338d598eec1477455294f006793ee54eead795 h: refs/heads/master i:   355107:
 d214b54451e0f5d0e11e349f8b04c904c24f9c0e 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 ff5560390c4c..1e0487dff37e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e78f96060fff8545d21360cfa5590e266a595bb9
+refs/heads/master: 61338d598eec1477455294f006793ee54eead795
diff --git a/trunk/arch/arm/mach-omap2/timer.c b/trunk/arch/arm/mach-omap2/timer.c
index b8ad6e632bb8..265de51b43d9 100644
--- a/trunk/arch/arm/mach-omap2/timer.c
+++ b/trunk/arch/arm/mach-omap2/timer.c
@@ -228,7 +228,7 @@ static int __init omap_dm_timer_init_one(struct omap_dm_timer *timer,
 	int r = 0;
 
 	if (of_have_populated_dt()) {
-		np = omap_get_timer_dt(omap_timer_match, NULL);
+		np = omap_get_timer_dt(omap_timer_match, property);
 		if (!np)
 			return -ENODEV;