diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-13 10:00:22 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-13 10:00:22 -0500 |
| commit | 4de3a8e101150feaefa1139611a50ff37467f33e (patch) | |
| tree | daada742542518b02d7db7c5d32e715eaa5f166d /arch/arm/mach-omap2/pm.h | |
| parent | 294064f58953f9964e5945424b09c51800330a83 (diff) | |
| parent | 099469502f62fbe0d7e4f0b83a2f22538367f734 (diff) | |
Merge branch 'master' into fixes
Diffstat (limited to 'arch/arm/mach-omap2/pm.h')
| -rw-r--r-- | arch/arm/mach-omap2/pm.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/pm.h b/arch/arm/mach-omap2/pm.h index 4e166add2f3..b737b11e449 100644 --- a/arch/arm/mach-omap2/pm.h +++ b/arch/arm/mach-omap2/pm.h | |||
| @@ -21,6 +21,7 @@ extern void omap_sram_idle(void); | |||
| 21 | extern int omap3_can_sleep(void); | 21 | extern int omap3_can_sleep(void); |
| 22 | extern int omap_set_pwrdm_state(struct powerdomain *pwrdm, u32 state); | 22 | extern int omap_set_pwrdm_state(struct powerdomain *pwrdm, u32 state); |
| 23 | extern int omap3_idle_init(void); | 23 | extern int omap3_idle_init(void); |
| 24 | extern int omap4_idle_init(void); | ||
| 24 | 25 | ||
| 25 | #if defined(CONFIG_PM_OPP) | 26 | #if defined(CONFIG_PM_OPP) |
| 26 | extern int omap3_opp_init(void); | 27 | extern int omap3_opp_init(void); |