---

yaml --- r: 355109 b: refs/heads/master c: 61338d5 h: refs/heads/master i: 355107: d214b54 v: v3
git-mirror · Feb 1, 2013 · 132c8d7 · 132c8d7
1 parent ae175d5
commit 132c8d7
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: e78f96060fff8545d21360cfa5590e266a595bb9
+refs/heads/master: 61338d598eec1477455294f006793ee54eead795
diff --git 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;