aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/mach-highbank/pm.c
diff options
context:
space:
mode:
authorRob Herring <rob.herring@calxeda.com>2012-09-17 09:55:12 -0500
committerOlof Johansson <olof@lixom.net>2012-09-20 22:58:17 -0700
commita283580c52d3aa24305985e945dfccfbcfc6f4f9 (patch)
tree5f730f0b78b557080c69c214b656a3bd4c65a95a /arch/arm/mach-highbank/pm.c
parent85594df2bad0dddb36aa8aa242f4d15e6f122f02 (diff)
downloadlinaro-lsk-a283580c52d3aa24305985e945dfccfbcfc6f4f9.tar.gz
ARM: highbank: call highbank_pm_init from .init_machine
Being a module_init call, highbank_pm_init will cause problem with multi-platform build running on other platforms. Call it from .init_machine instead. Reported-by: Shawn Guo <shawn.guo@linaro.org> Signed-off-by: Rob Herring <rob.herring@calxeda.com> Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-highbank/pm.c')
-rw-r--r--arch/arm/mach-highbank/pm.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/mach-highbank/pm.c b/arch/arm/mach-highbank/pm.c
index 33b3beb8998..de866f21331 100644
--- a/arch/arm/mach-highbank/pm.c
+++ b/arch/arm/mach-highbank/pm.c
@@ -47,9 +47,7 @@ static const struct platform_suspend_ops highbank_pm_ops = {
.valid = suspend_valid_only_mem,
};
-static int __init highbank_pm_init(void)
+void __init highbank_pm_init(void)
{
suspend_set_ops(&highbank_pm_ops);
- return 0;
}
-module_init(highbank_pm_init);