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/highbank.c | |
| parent | ARM: dtb: move all dtb targets to common Makefile (diff) | |
| download | linux-dev-a283580c52d3aa24305985e945dfccfbcfc6f4f9.tar.xz linux-dev-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/highbank.c')
| -rw-r--r-- | arch/arm/mach-highbank/highbank.c | 1 |
1 files changed, 1 insertions, 0 deletions
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); } |