diff options
-rw-r--r-- | arch/arm/mach-highbank/core.h | 6 | ||||
-rw-r--r-- | arch/arm/mach-highbank/highbank.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-highbank/pm.c | 4 |
3 files changed, 8 insertions, 3 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); | |||
8 | static inline void highbank_lluart_map_io(void) {} | 8 | static inline void highbank_lluart_map_io(void) {} |
9 | #endif | 9 | #endif |
10 | 10 | ||
11 | #ifdef CONFIG_PM_SLEEP | ||
12 | extern void highbank_pm_init(void); | ||
13 | #else | ||
14 | static inline void highbank_pm_init(void) {} | ||
15 | #endif | ||
16 | |||
11 | extern void highbank_smc1(int fn, int arg); | 17 | extern void highbank_smc1(int fn, int arg); |
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) | |||
152 | static void __init highbank_init(void) | 152 | static void __init highbank_init(void) |
153 | { | 153 | { |
154 | pm_power_off = highbank_power_off; | 154 | pm_power_off = highbank_power_off; |
155 | highbank_pm_init(); | ||
155 | 156 | ||
156 | of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); | 157 | of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); |
157 | } | 158 | } |
diff --git a/arch/arm/mach-highbank/pm.c b/arch/arm/mach-highbank/pm.c index 33b3beb89982..de866f21331f 100644 --- a/arch/arm/mach-highbank/pm.c +++ b/arch/arm/mach-highbank/pm.c | |||
@@ -47,9 +47,7 @@ static const struct platform_suspend_ops highbank_pm_ops = { | |||
47 | .valid = suspend_valid_only_mem, | 47 | .valid = suspend_valid_only_mem, |
48 | }; | 48 | }; |
49 | 49 | ||
50 | static int __init highbank_pm_init(void) | 50 | void __init highbank_pm_init(void) |
51 | { | 51 | { |
52 | suspend_set_ops(&highbank_pm_ops); | 52 | suspend_set_ops(&highbank_pm_ops); |
53 | return 0; | ||
54 | } | 53 | } |
55 | module_init(highbank_pm_init); | ||