Merge branch 'master' into for-next

[firefly-linux-kernel-4.4.55.git] / arch / arm / mach-omap2 / pm24xx.c

diff --git a/arch/arm/mach-omap2/pm24xx.c b/arch/arm/mach-omap2/pm24xx.c
index aaeea49b9bdd80f6e51affaee9c3a38ff6e2368f..f3f3bfa230d7218d4a0cd4a87db660ac5fec0710 100644 (file)
--- a/arch/arm/mach-omap2/pm24xx.c
+++ b/arch/arm/mach-omap2/pm24xx.c
@@ -359,7 +359,7 @@ static void omap2_pm_end(void)
        suspend_state = PM_SUSPEND_ON;
 }
 
-static struct platform_suspend_ops omap_pm_ops = {
+static const struct platform_suspend_ops omap_pm_ops = {
        .begin          = omap2_pm_begin,
        .prepare        = omap2_pm_prepare,
        .enter          = omap2_pm_enter,