---

yaml --- r: 313272 b: refs/heads/master c: 6e15223 h: refs/heads/master v: v3
git-mirror · Jul 9, 2012 · 28ab17f · 28ab17f
1 parent 3c54502
commit 28ab17f
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: 94c30732944a03c5d4249abefbea09147579fb92
+refs/heads/master: 6e152231995aa4ed5eafd87a6a8348563248f843
diff --git a/trunk/arch/arm/mach-omap2/devices.c b/trunk/arch/arm/mach-omap2/devices.c
@@ -772,7 +772,7 @@ static int __init omap_init_wdt(void)
 	char *oh_name = "wd_timer2";
 	char *dev_name = "omap_wdt";
 
-	if (!cpu_class_is_omap2())
+	if (!cpu_class_is_omap2() || of_have_populated_dt())
 		return 0;
 
 	oh = omap_hwmod_lookup(oh_name);