diff options
author | Shawn Guo <shawn.guo@linaro.org> | 2013-03-29 07:41:27 +0100 |
---|---|---|
committer | Shawn Guo <shawn.guo@linaro.org> | 2013-04-04 15:15:57 +0200 |
commit | 45680995cd8ccf5eb71a1808eb96408589d37a26 (patch) | |
tree | 0ad2b5c89a2a4138de4f2538180833491f8d8f06 /arch/arm/mach-mxs/pm.c | |
parent | clocksource: mxs_timer: Add semicolon at end of line (diff) | |
download | linux-45680995cd8ccf5eb71a1808eb96408589d37a26.tar.xz linux-45680995cd8ccf5eb71a1808eb96408589d37a26.zip |
ARM: mxs: call mxs_pm_init() as a machine_desc hook
The device_initcall is not a friend of multiplatform build. Call
mxs_pm_init() as a machine_desc hook instead of device_initcall.
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Diffstat (limited to 'arch/arm/mach-mxs/pm.c')
-rw-r--r-- | arch/arm/mach-mxs/pm.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/mach-mxs/pm.c b/arch/arm/mach-mxs/pm.c index a9b4bbcdafb4..b2494d2db2c4 100644 --- a/arch/arm/mach-mxs/pm.c +++ b/arch/arm/mach-mxs/pm.c @@ -34,9 +34,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); |