From 7cf4eb058f37afb1d46f26d835c1468ac85369fc Mon Sep 17 00:00:00 2001
From: Pavel Machek <pavel@ucw.cz>
Date: Thu, 11 Jun 2009 23:25:09 +0800
Subject: [PATCH] --- yaml --- r: 149373 b: refs/heads/master c:
 51cdd9289d2e0d83eb32ed6d7a42596b02bf924e h: refs/heads/master i:   149371:
 f28c97b480cd13623ce04a80bb5e893f3a516c4c v: v3

---
 [refs]                                    | 2 +-
 trunk/arch/arm/mach-pxa/include/mach/pm.h | 2 ++
 trunk/arch/arm/mach-pxa/pm.c              | 4 ++--
 trunk/arch/arm/mach-pxa/sharpsl_pm.c      | 2 ++
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 3a5cdb7bec87..a4fdd5634da5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d5af27783f8c898b64f7079908ad3e27632a71ea
+refs/heads/master: 51cdd9289d2e0d83eb32ed6d7a42596b02bf924e
diff --git a/trunk/arch/arm/mach-pxa/include/mach/pm.h b/trunk/arch/arm/mach-pxa/include/mach/pm.h
index a6eeef8a075f..fd8360c6839d 100644
--- a/trunk/arch/arm/mach-pxa/include/mach/pm.h
+++ b/trunk/arch/arm/mach-pxa/include/mach/pm.h
@@ -27,6 +27,8 @@ extern void pxa27x_cpu_suspend(unsigned int);
 extern void pxa_cpu_resume(void);
 
 extern int pxa_pm_enter(suspend_state_t state);
+extern int pxa_pm_prepare(void);
+extern void pxa_pm_finish(void);
 
 /* NOTE: this is for PM debugging on Lubbock,  it's really a big
  * ugly, but let's keep the crap minimum here, instead of direct
diff --git a/trunk/arch/arm/mach-pxa/pm.c b/trunk/arch/arm/mach-pxa/pm.c
index 884b174c8ead..7693355ee637 100644
--- a/trunk/arch/arm/mach-pxa/pm.c
+++ b/trunk/arch/arm/mach-pxa/pm.c
@@ -79,7 +79,7 @@ static int pxa_pm_valid(suspend_state_t state)
 	return -EINVAL;
 }
 
-static int pxa_pm_prepare(void)
+int pxa_pm_prepare(void)
 {
 	int ret = 0;
 
@@ -89,7 +89,7 @@ static int pxa_pm_prepare(void)
 	return ret;
 }
 
-static void pxa_pm_finish(void)
+void pxa_pm_finish(void)
 {
 	if (pxa_cpu_pm_fns && pxa_cpu_pm_fns->finish)
 		pxa_cpu_pm_fns->finish();
diff --git a/trunk/arch/arm/mach-pxa/sharpsl_pm.c b/trunk/arch/arm/mach-pxa/sharpsl_pm.c
index dfac7b9a7352..2546c066cd6e 100644
--- a/trunk/arch/arm/mach-pxa/sharpsl_pm.c
+++ b/trunk/arch/arm/mach-pxa/sharpsl_pm.c
@@ -892,6 +892,8 @@ static void sharpsl_apm_get_power_status(struct apm_power_info *info)
 
 #ifdef CONFIG_PM
 static struct platform_suspend_ops sharpsl_pm_ops = {
+	.prepare	= pxa_pm_prepare,
+	.finish		= pxa_pm_finish,
 	.enter		= corgi_pxa_pm_enter,
 	.valid		= suspend_valid_only_mem,
 };