diff options
| author | Rob Herring <rob.herring@calxeda.com> | 2012-09-17 09:55:12 -0500 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-09-20 22:58:17 -0700 |
| commit | a283580c52d3aa24305985e945dfccfbcfc6f4f9 (patch) | |
| tree | 5f730f0b78b557080c69c214b656a3bd4c65a95a /arch/arm/mach-highbank/core.h | |
| parent | 85594df2bad0dddb36aa8aa242f4d15e6f122f02 (diff) | |
| download | blackbird-op-linux-a283580c52d3aa24305985e945dfccfbcfc6f4f9.tar.gz blackbird-op-linux-a283580c52d3aa24305985e945dfccfbcfc6f4f9.zip | |
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/core.h')
| -rw-r--r-- | arch/arm/mach-highbank/core.h | 6 |
1 files changed, 6 insertions, 0 deletions
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); |
