diff options
| author | Tony Lindgren <tony@atomide.com> | 2011-06-29 15:45:16 +0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-06-29 15:45:16 +0400 |
| commit | 48cb1258e8b0f8c81cfb699b42326c5b2147b3f8 (patch) | |
| tree | 6dc560f24eec8d303534d86b1e20d037df94a68d /arch/arm/mach-omap2/pm.h | |
| parent | 332acd9e534e0bc8713d2cb90dd2d4d5f2485401 (diff) | |
| parent | ec3cdb5baedf6bb3852c531426c1e95a13671dff (diff) | |
| download | linux-48cb1258e8b0f8c81cfb699b42326c5b2147b3f8.tar.xz | |
Merge branch 'for_3.1/pm-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into devel-cleanup
Conflicts:
arch/arm/mach-omap2/pm-debug.c
arch/arm/mach-omap2/pm.h
Diffstat (limited to 'arch/arm/mach-omap2/pm.h')
| -rw-r--r-- | arch/arm/mach-omap2/pm.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/arch/arm/mach-omap2/pm.h b/arch/arm/mach-omap2/pm.h index c3a367e3d010..babac19e3ec1 100644 --- a/arch/arm/mach-omap2/pm.h +++ b/arch/arm/mach-omap2/pm.h @@ -61,25 +61,15 @@ extern int omap3_pm_get_suspend_state(struct powerdomain *pwrdm); extern int omap3_pm_set_suspend_state(struct powerdomain *pwrdm, int state); #ifdef CONFIG_PM_DEBUG -extern void omap2_pm_dump(int mode, int resume, unsigned int us); -extern int omap2_pm_debug; extern u32 enable_off_mode; -extern u32 sleep_while_idle; #else -#define omap2_pm_dump(mode, resume, us) do {} while (0); -#define omap2_pm_debug 0 #define enable_off_mode 0 -#define sleep_while_idle 0 #endif #if defined(CONFIG_PM_DEBUG) && defined(CONFIG_DEBUG_FS) extern void pm_dbg_update_time(struct powerdomain *pwrdm, int prev); -extern int pm_dbg_regset_save(int reg_set); -extern int pm_dbg_regset_init(int reg_set); #else #define pm_dbg_update_time(pwrdm, prev) do {} while (0); -#define pm_dbg_regset_save(reg_set) do {} while (0); -#define pm_dbg_regset_init(reg_set) do {} while (0); #endif /* CONFIG_PM_DEBUG */ extern void omap24xx_idle_loop_suspend(void); |