From 28ab17f559d2ebcfb6fab3294a15c4ec747d327f Mon Sep 17 00:00:00 2001 From: Xiao Jiang Date: Fri, 1 Jun 2012 12:44:15 +0800 Subject: [PATCH] --- yaml --- r: 313272 b: refs/heads/master c: 6e152231995aa4ed5eafd87a6a8348563248f843 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-omap2/devices.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 45c65d650708..a99388f460df 100644 --- 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 index 7b4b9327e543..527c0046064d 100644 --- 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);