summaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-omap
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2009-10-06 08:32:28 -0700
committerTony Lindgren <tony@atomide.com>2009-10-06 08:32:28 -0700
commitab8d64d7d4ea49cf664ca5562263a8ba78f4541e (patch)
treeb55e5a587e2d0047fd645ba926db4fa784f2ea84 /arch/arm/plat-omap
parent82e865011accc9fd1e048961da7cefc4d08f3292 (diff)
parentee894b18e064447f86019af38a90ccb091880942 (diff)
downloadtalos-obmc-linux-ab8d64d7d4ea49cf664ca5562263a8ba78f4541e.tar.gz
talos-obmc-linux-ab8d64d7d4ea49cf664ca5562263a8ba78f4541e.zip
Merge branch 'pm-fixes-32' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into omap-fixes-for-linus
Diffstat (limited to 'arch/arm/plat-omap')
-rw-r--r--arch/arm/plat-omap/include/mach/powerdomain.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/plat-omap/include/mach/powerdomain.h b/arch/arm/plat-omap/include/mach/powerdomain.h
index 6271d8556a40..fa6461423bd0 100644
--- a/arch/arm/plat-omap/include/mach/powerdomain.h
+++ b/arch/arm/plat-omap/include/mach/powerdomain.h
@@ -135,6 +135,8 @@ struct powerdomain *pwrdm_lookup(const char *name);
int pwrdm_for_each(int (*fn)(struct powerdomain *pwrdm, void *user),
void *user);
+int pwrdm_for_each_nolock(int (*fn)(struct powerdomain *pwrdm, void *user),
+ void *user);
int pwrdm_add_clkdm(struct powerdomain *pwrdm, struct clockdomain *clkdm);
int pwrdm_del_clkdm(struct powerdomain *pwrdm, struct clockdomain *clkdm);
OpenPOWER on IntegriCloud