summaryrefslogtreecommitdiff
path: root/arch/arm/mach-omap2/pm.h
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2010-12-21 17:05:57 -0800
committerTony Lindgren <tony@atomide.com>2010-12-21 17:05:57 -0800
commitb9e7683bbca638967a56e5d7fd4035a947109621 (patch)
tree3d02725c6e6bb3d77e1c34a04d5179ea4ee2509e /arch/arm/mach-omap2/pm.h
parentbb3613aa34a81a5e2f1227ccdb801fde04a7da10 (diff)
parent53da4ce23809ca33405001b0ae117e60b7feced1 (diff)
Merge branch 'pm-opp' of ssh://master.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into omap-for-linus
Diffstat (limited to 'arch/arm/mach-omap2/pm.h')
-rw-r--r--arch/arm/mach-omap2/pm.h14
1 files changed, 14 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/pm.h b/arch/arm/mach-omap2/pm.h
index c04f7b50e26f..8b4f45eba1b5 100644
--- a/arch/arm/mach-omap2/pm.h
+++ b/arch/arm/mach-omap2/pm.h
@@ -20,6 +20,20 @@ extern int omap3_can_sleep(void);
extern int omap_set_pwrdm_state(struct powerdomain *pwrdm, u32 state);
extern int omap3_idle_init(void);
+#if defined(CONFIG_PM_OPP)
+extern int omap3_opp_init(void);
+extern int omap4_opp_init(void);
+#else
+static inline int omap3_opp_init(void)
+{
+ return -EINVAL;
+}
+static inline int omap4_opp_init(void)
+{
+ return -EINVAL;
+}
+#endif
+
struct cpuidle_params {
u8 valid;
u32 sleep_latency;