summaryrefslogtreecommitdiff
path: root/arch/arm/mach-pxa/include/mach/pm.h
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@elm.ozlabs.ibm.com>2008-09-12 05:44:18 +1000
committerStephen Rothwell <sfr@elm.ozlabs.ibm.com>2008-09-12 05:44:18 +1000
commitead1241e61abb84adcd13d0828e6c91c33ed0d66 (patch)
tree054f01fd9a2c880b3899c36e4eef7ea4dea8b484 /arch/arm/mach-pxa/include/mach/pm.h
parent69169505f0c8226f728e67faf4566114994aea6d (diff)
parentb584cb9ef50a0138b3c15b2aa6a5d8b21258ccd2 (diff)
Merge commit 'arm/devel'
Diffstat (limited to 'arch/arm/mach-pxa/include/mach/pm.h')
-rw-r--r--arch/arm/mach-pxa/include/mach/pm.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/include/mach/pm.h b/arch/arm/mach-pxa/include/mach/pm.h
index 261e5bc958db..83342469acac 100644
--- a/arch/arm/mach-pxa/include/mach/pm.h
+++ b/arch/arm/mach-pxa/include/mach/pm.h
@@ -15,6 +15,8 @@ struct pxa_cpu_pm_fns {
void (*restore)(unsigned long *);
int (*valid)(suspend_state_t state);
void (*enter)(suspend_state_t state);
+ int (*prepare)(void);
+ void (*finish)(void);
};
extern struct pxa_cpu_pm_fns *pxa_cpu_pm_fns;