summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-highbank/highbank.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/highbank.c
parent85594df2bad0dddb36aa8aa242f4d15e6f122f02 (diff)
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/highbank.c')
-rw-r--r--arch/arm/mach-highbank/highbank.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-highbank/highbank.c b/arch/arm/mach-highbank/highbank.c
index d75b0a78d88..f376c26cb0e 100644
--- a/arch/arm/mach-highbank/highbank.c
+++ b/arch/arm/mach-highbank/highbank.c
@@ -152,6 +152,7 @@ static void highbank_power_off(void)
static void __init highbank_init(void)
{
pm_power_off = highbank_power_off;
+ highbank_pm_init();
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
}