diff options
| author | Tony Lindgren <tony@atomide.com> | 2009-10-06 11:32:28 -0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2009-10-06 11:32:28 -0400 |
| commit | ab8d64d7d4ea49cf664ca5562263a8ba78f4541e (patch) | |
| tree | b55e5a587e2d0047fd645ba926db4fa784f2ea84 /arch/arm/plat-omap/include | |
| parent | 82e865011accc9fd1e048961da7cefc4d08f3292 (diff) | |
| parent | ee894b18e064447f86019af38a90ccb091880942 (diff) | |
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/include')
| -rw-r--r-- | arch/arm/plat-omap/include/mach/powerdomain.h | 2 |
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); | |||
| 135 | 135 | ||
| 136 | int pwrdm_for_each(int (*fn)(struct powerdomain *pwrdm, void *user), | 136 | int pwrdm_for_each(int (*fn)(struct powerdomain *pwrdm, void *user), |
| 137 | void *user); | 137 | void *user); |
| 138 | int pwrdm_for_each_nolock(int (*fn)(struct powerdomain *pwrdm, void *user), | ||
| 139 | void *user); | ||
| 138 | 140 | ||
| 139 | int pwrdm_add_clkdm(struct powerdomain *pwrdm, struct clockdomain *clkdm); | 141 | int pwrdm_add_clkdm(struct powerdomain *pwrdm, struct clockdomain *clkdm); |
| 140 | int pwrdm_del_clkdm(struct powerdomain *pwrdm, struct clockdomain *clkdm); | 142 | int pwrdm_del_clkdm(struct powerdomain *pwrdm, struct clockdomain *clkdm); |