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/highbank.c | 1 + 1 file changed, 1 insertion(+) (limited to 'arch/arm/mach-highbank/highbank.c') diff --git a/arch/arm/mach-highbank/highbank.c b/arch/arm/mach-highbank/highbank.c index d75b0a78d88a..f376c26cb0e1 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); } -- cgit v1.2.3-59-g8ed1b