projects
/
linux-flexiantxendom0-natty.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
[linux-flexiantxendom0-natty.git]
/
arch
/
arm
/
mach-pxa
/
sharpsl_pm.c
diff --git
a/arch/arm/mach-pxa/sharpsl_pm.c
b/arch/arm/mach-pxa/sharpsl_pm.c
index
e68d46d
..
785880f
100644
(file)
--- a/
arch/arm/mach-pxa/sharpsl_pm.c
+++ b/
arch/arm/mach-pxa/sharpsl_pm.c
@@
-869,7
+869,7
@@
static void sharpsl_apm_get_power_status(struct apm_power_info *info)
}
#ifdef CONFIG_PM
-static struct platform_suspend_ops sharpsl_pm_ops = {
+static const struct platform_suspend_ops sharpsl_pm_ops = {
.prepare = pxa_pm_prepare,
.finish = pxa_pm_finish,
.enter = corgi_pxa_pm_enter,