diff options
author | Eric Miao <eric.y.miao@gmail.com> | 2011-09-11 05:19:11 -0400 |
---|---|---|
committer | Eric Miao <eric.y.miao@gmail.com> | 2011-10-08 09:02:44 -0400 |
commit | ba4a90a6d86a428c295775b46e653ab8f8e459b8 (patch) | |
tree | 7882cd7abce23eca89d74dc61fba5fab3a64712a /arch/arm | |
parent | e227e88ae46e921f608b056e27e1d8704b7d12fa (diff) |
ARM: pxa/z2: fix building error of pxa27x_cpu_suspend() no longer available
Cc: Vasily Khoruzhick <anarsoul@gmail.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/mach-pxa/include/mach/pxa27x.h | 2 | ||||
-rw-r--r-- | arch/arm/mach-pxa/z2.c | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/include/mach/pxa27x.h b/arch/arm/mach-pxa/include/mach/pxa27x.h index b9b1bdc4bacc..7cff640582b8 100644 --- a/arch/arm/mach-pxa/include/mach/pxa27x.h +++ b/arch/arm/mach-pxa/include/mach/pxa27x.h | |||
@@ -1,6 +1,7 @@ | |||
1 | #ifndef __MACH_PXA27x_H | 1 | #ifndef __MACH_PXA27x_H |
2 | #define __MACH_PXA27x_H | 2 | #define __MACH_PXA27x_H |
3 | 3 | ||
4 | #include <linux/suspend.h> | ||
4 | #include <mach/hardware.h> | 5 | #include <mach/hardware.h> |
5 | #include <mach/pxa2xx-regs.h> | 6 | #include <mach/pxa2xx-regs.h> |
6 | #include <mach/mfp-pxa27x.h> | 7 | #include <mach/mfp-pxa27x.h> |
@@ -21,6 +22,7 @@ | |||
21 | extern void __init pxa27x_map_io(void); | 22 | extern void __init pxa27x_map_io(void); |
22 | extern void __init pxa27x_init_irq(void); | 23 | extern void __init pxa27x_init_irq(void); |
23 | extern int __init pxa27x_set_pwrmode(unsigned int mode); | 24 | extern int __init pxa27x_set_pwrmode(unsigned int mode); |
25 | extern void pxa27x_cpu_pm_enter(suspend_state_t state); | ||
24 | 26 | ||
25 | #define pxa27x_handle_irq ichp_handle_irq | 27 | #define pxa27x_handle_irq ichp_handle_irq |
26 | 28 | ||
diff --git a/arch/arm/mach-pxa/z2.c b/arch/arm/mach-pxa/z2.c index 6c9275a20c91..a82d4207f235 100644 --- a/arch/arm/mach-pxa/z2.c +++ b/arch/arm/mach-pxa/z2.c | |||
@@ -686,7 +686,8 @@ static void z2_power_off(void) | |||
686 | */ | 686 | */ |
687 | PSPR = 0x0; | 687 | PSPR = 0x0; |
688 | local_irq_disable(); | 688 | local_irq_disable(); |
689 | pxa27x_cpu_suspend(PWRMODE_DEEPSLEEP, PLAT_PHYS_OFFSET - PAGE_OFFSET); | 689 | pxa27x_set_pwrmode(PWRMODE_DEEPSLEEP); |
690 | pxa27x_cpu_pm_enter(PM_SUSPEND_MEM); | ||
690 | } | 691 | } |
691 | #else | 692 | #else |
692 | #define z2_power_off NULL | 693 | #define z2_power_off NULL |