diff options
author | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 14:07:51 +0100 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 14:07:51 +0100 |
commit | 86c1e5a74af11e4817ffa6d7748d9ac1353b5b53 (patch) | |
tree | 377327a40452c4282787f49456122bf1753a0255 /arch/arm/mach-omap2/clockdomain44xx.c | |
parent | 6a8d2e2b504ce3d12cfa3934f545c9415441a5c3 (diff) | |
parent | 3ae3e253db7385238dd9d6c67c085afa3e770a56 (diff) | |
download | talos-op-linux-86c1e5a74af11e4817ffa6d7748d9ac1353b5b53.tar.gz talos-op-linux-86c1e5a74af11e4817ffa6d7748d9ac1353b5b53.zip |
Merge branch 'omap/dt' into next/dt
Diffstat (limited to 'arch/arm/mach-omap2/clockdomain44xx.c')
-rw-r--r-- | arch/arm/mach-omap2/clockdomain44xx.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/clockdomain44xx.c b/arch/arm/mach-omap2/clockdomain44xx.c index b43706aa08bd..935c7f03dab9 100644 --- a/arch/arm/mach-omap2/clockdomain44xx.c +++ b/arch/arm/mach-omap2/clockdomain44xx.c @@ -52,8 +52,6 @@ static int omap4_clkdm_clear_all_wkup_sleep_deps(struct clockdomain *clkdm) u32 mask = 0; for (cd = clkdm->wkdep_srcs; cd && cd->clkdm_name; cd++) { - if (!omap_chip_is(cd->omap_chip)) - continue; if (!cd->clkdm) continue; /* only happens if data is erroneous */ |