From a283580c52d3aa24305985e945dfccfbcfc6f4f9 Mon Sep 17 00:00:00 2001 From: Rob Herring Date: Mon, 17 Sep 2012 09:55:12 -0500 Subject: 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 Signed-off-by: Rob Herring Signed-off-by: Olof Johansson --- arch/arm/mach-highbank/pm.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'arch/arm/mach-highbank/pm.c') diff --git a/arch/arm/mach-highbank/pm.c b/arch/arm/mach-highbank/pm.c index 33b3beb89982..de866f21331f 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); -- cgit v1.2.3