Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-hrt

[linux-2.6-omap-h63xx.git] / arch / arm / mach-pnx4008 / pm.c

diff --git a/arch/arm/mach-pnx4008/pm.c b/arch/arm/mach-pnx4008/pm.c
index 2a137f33f752698daac232049e4fcd3309d30581..40116d2543496c284af73a8fde5d94c789951cd5 100644 (file)
--- a/arch/arm/mach-pnx4008/pm.c
+++ b/arch/arm/mach-pnx4008/pm.c
@@ -15,7 +15,7 @@
 #include <linux/rtc.h>
 #include <linux/sched.h>
 #include <linux/proc_fs.h>
-#include <linux/pm.h>
+#include <linux/suspend.h>
 #include <linux/delay.h>
 #include <linux/clk.h>
 
@@ -117,7 +117,7 @@ static int pnx4008_pm_valid(suspend_state_t state)
               (state == PM_SUSPEND_MEM);
 }
 
-static struct pm_ops pnx4008_pm_ops = {
+static struct platform_suspend_ops pnx4008_pm_ops = {
        .enter = pnx4008_pm_enter,
        .valid = pnx4008_pm_valid,
 };
@@ -146,7 +146,7 @@ static int __init pnx4008_pm_init(void)
                return -ENOMEM;
        }
 
-       pm_set_ops(&pnx4008_pm_ops);
+       suspend_set_ops(&pnx4008_pm_ops);
        return 0;
 }