aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/mach-mxs/pm.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-mxs/pm.c')
-rw-r--r--arch/arm/mach-mxs/pm.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/arch/arm/mach-mxs/pm.c b/arch/arm/mach-mxs/pm.c
index fb042da29bd..0170e99fd70 100644
--- a/arch/arm/mach-mxs/pm.c
+++ b/arch/arm/mach-mxs/pm.c
@@ -15,13 +15,13 @@
#include <linux/kernel.h>
#include <linux/suspend.h>
#include <linux/io.h>
-#include <mach/system.h>
+#include "pm.h"
static int mxs_suspend_enter(suspend_state_t state)
{
switch (state) {
case PM_SUSPEND_MEM:
- arch_idle();
+ cpu_do_idle();
break;
default:
@@ -35,9 +35,7 @@ static struct platform_suspend_ops mxs_suspend_ops = {
.valid = suspend_valid_only_mem,
};
-static int __init mxs_pm_init(void)
+void __init mxs_pm_init(void)
{
suspend_set_ops(&mxs_suspend_ops);
- return 0;
}
-device_initcall(mxs_pm_init);