diff options
author | Loïc Minier <loic.minier@linaro.org> | 2010-09-27 17:04:20 -0400 |
---|---|---|
committer | Kevin Hilman <khilman@deeprootsystems.com> | 2010-10-01 16:50:34 -0400 |
commit | ebfa88cfa1f00022c500e35db63b5f6c977c95c0 (patch) | |
tree | 932d17dcbf65329dae6982e16956fdeef7ce7bb2 /arch/arm/mach-omap2/pm.h | |
parent | 65707fb3794e9cf75665f9ef91cfb07c50d3ffa5 (diff) |
OMAP: PM: Fix build when CONFIG_PM_DEBUG isn't set
Since 6cdee91257bee23a46dc869ca62469b67cba2c7e the references to
enable_off_mode and sleep_while_idle can't be resolved when CONFIG_PM_DEBUG
isn't set:
arch/arm/mach-omap2/built-in.o: In function `omap_uart_restore_context':
arch/arm/mach-omap2/serial.c:253: undefined reference to `enable_off_mode'
arch/arm/mach-omap2/built-in.o: In function `omap3_can_sleep':
arch/arm/mach-omap2/pm34xx.c:479: undefined reference to `sleep_while_idle'
Simply #define these in pm.h just like omap2_pm_debug.
Signed-off-by: Loïc Minier <loic.minier@linaro.org>
[khilman: moved down into existing #ifdef section]
Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
Diffstat (limited to 'arch/arm/mach-omap2/pm.h')
-rw-r--r-- | arch/arm/mach-omap2/pm.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/pm.h b/arch/arm/mach-omap2/pm.h index 77770a13cea8..0d75bfd1fdbe 100644 --- a/arch/arm/mach-omap2/pm.h +++ b/arch/arm/mach-omap2/pm.h | |||
@@ -13,9 +13,6 @@ | |||
13 | 13 | ||
14 | #include <plat/powerdomain.h> | 14 | #include <plat/powerdomain.h> |
15 | 15 | ||
16 | extern u32 enable_off_mode; | ||
17 | extern u32 sleep_while_idle; | ||
18 | |||
19 | extern void *omap3_secure_ram_storage; | 16 | extern void *omap3_secure_ram_storage; |
20 | extern void omap3_pm_off_mode_enable(int); | 17 | extern void omap3_pm_off_mode_enable(int); |
21 | extern void omap_sram_idle(void); | 18 | extern void omap_sram_idle(void); |
@@ -50,10 +47,14 @@ extern struct omap_dm_timer *gptimer_wakeup; | |||
50 | extern void omap2_pm_dump(int mode, int resume, unsigned int us); | 47 | extern void omap2_pm_dump(int mode, int resume, unsigned int us); |
51 | extern void omap2_pm_wakeup_on_timer(u32 seconds, u32 milliseconds); | 48 | extern void omap2_pm_wakeup_on_timer(u32 seconds, u32 milliseconds); |
52 | extern int omap2_pm_debug; | 49 | extern int omap2_pm_debug; |
50 | extern u32 enable_off_mode; | ||
51 | extern u32 sleep_while_idle; | ||
53 | #else | 52 | #else |
54 | #define omap2_pm_dump(mode, resume, us) do {} while (0); | 53 | #define omap2_pm_dump(mode, resume, us) do {} while (0); |
55 | #define omap2_pm_wakeup_on_timer(seconds, milliseconds) do {} while (0); | 54 | #define omap2_pm_wakeup_on_timer(seconds, milliseconds) do {} while (0); |
56 | #define omap2_pm_debug 0 | 55 | #define omap2_pm_debug 0 |
56 | #define enable_off_mode 0 | ||
57 | #define sleep_while_idle 0 | ||
57 | #endif | 58 | #endif |
58 | 59 | ||
59 | #if defined(CONFIG_CPU_IDLE) | 60 | #if defined(CONFIG_CPU_IDLE) |