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/core.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'arch/arm/mach-highbank/core.h') diff --git a/arch/arm/mach-highbank/core.h b/arch/arm/mach-highbank/core.h index 141ed5171826..8b9fb1a46a91 100644 --- a/arch/arm/mach-highbank/core.h +++ b/arch/arm/mach-highbank/core.h @@ -8,4 +8,10 @@ extern void highbank_lluart_map_io(void); static inline void highbank_lluart_map_io(void) {} #endif +#ifdef CONFIG_PM_SLEEP +extern void highbank_pm_init(void); +#else +static inline void highbank_pm_init(void) {} +#endif + extern void highbank_smc1(int fn, int arg); -- cgit v1.2.3