summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa/include/mach
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2011-02-06 17:41:26 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-02-22 17:11:24 +0000
commit4f5ad99bb5331c571371f94ff4423cbb366c460b (patch)
tree915f4e620a5b45cdac2c8d9335410a880db71ebc /arch/arm/mach-pxa/include/mach
parentf6b0fa02e8b0708d17d631afce456524eadf87ff (diff)
downloadblackbird-op-linux-4f5ad99bb5331c571371f94ff4423cbb366c460b.tar.gz
blackbird-op-linux-4f5ad99bb5331c571371f94ff4423cbb366c460b.zip
ARM: pm: convert PXA to generic suspend/resume support
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-pxa/include/mach')
-rw-r--r--arch/arm/mach-pxa/include/mach/pm.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/mach-pxa/include/mach/pm.h b/arch/arm/mach-pxa/include/mach/pm.h
index fd8360c6839d..f15afe012995 100644
--- a/arch/arm/mach-pxa/include/mach/pm.h
+++ b/arch/arm/mach-pxa/include/mach/pm.h
@@ -22,9 +22,8 @@ struct pxa_cpu_pm_fns {
extern struct pxa_cpu_pm_fns *pxa_cpu_pm_fns;
/* sleep.S */
-extern void pxa25x_cpu_suspend(unsigned int);
-extern void pxa27x_cpu_suspend(unsigned int);
-extern void pxa_cpu_resume(void);
+extern void pxa25x_cpu_suspend(unsigned int, long);
+extern void pxa27x_cpu_suspend(unsigned int, long);
extern int pxa_pm_enter(suspend_state_t state);
extern int pxa_pm_prepare(void);
OpenPOWER on IntegriCloud