aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/plat-omap/include/mach/clockdomain.h
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2009-09-02 15:23:05 -0700
committerTony Lindgren <tony@atomide.com>2009-09-02 15:23:05 -0700
commit5567fa1f543dde3c42f8e52bf4f7005135b24896 (patch)
treef4e2815758d5dd15f75a6c1523c1abc50966cdcb /arch/arm/plat-omap/include/mach/clockdomain.h
parentd3d381c6365ef5b06c4184a3fe047cf027533970 (diff)
parent68d4778c701b7e22ddfd64e3afb6628c92718ad2 (diff)
Merge branch 'pm-upstream/debug' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into for-next
Diffstat (limited to 'arch/arm/plat-omap/include/mach/clockdomain.h')
-rw-r--r--arch/arm/plat-omap/include/mach/clockdomain.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/plat-omap/include/mach/clockdomain.h b/arch/arm/plat-omap/include/mach/clockdomain.h
index b9d0dd2da89..99ebd886f13 100644
--- a/arch/arm/plat-omap/include/mach/clockdomain.h
+++ b/arch/arm/plat-omap/include/mach/clockdomain.h
@@ -95,7 +95,8 @@ int clkdm_register(struct clockdomain *clkdm);
int clkdm_unregister(struct clockdomain *clkdm);
struct clockdomain *clkdm_lookup(const char *name);
-int clkdm_for_each(int (*fn)(struct clockdomain *clkdm));
+int clkdm_for_each(int (*fn)(struct clockdomain *clkdm, void *user),
+ void *user);
struct powerdomain *clkdm_get_pwrdm(struct clockdomain *clkdm);
void omap2_clkdm_allow_idle(struct clockdomain *clkdm);