diff options
author | Anton Vorontsov <avorontsov@ru.mvista.com> | 2009-09-23 14:52:38 -0400 |
---|---|---|
committer | Kumar Gala <galak@kernel.crashing.org> | 2009-11-11 22:43:33 -0500 |
commit | 2e9d546eda5888962a441da1e96bbf92cb5b1cbb (patch) | |
tree | ff8e644eeb4722c0b57bb3ee0fe38feff4670944 | |
parent | 1f8a25d4a461865c7f38e93dcecbee63b3968d21 (diff) |
powerpc/fsl: Make fsl_deep_sleep() usable w/ modules and non-83xx builds
Export is needed for modular builds, and a static inline stub is needed
for non-MPC83xx builds.
Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
-rw-r--r-- | arch/powerpc/platforms/83xx/suspend.c | 1 | ||||
-rw-r--r-- | include/linux/fsl_devices.h | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/arch/powerpc/platforms/83xx/suspend.c b/arch/powerpc/platforms/83xx/suspend.c index 08e65fc8b98c..d306f07b9aa1 100644 --- a/arch/powerpc/platforms/83xx/suspend.c +++ b/arch/powerpc/platforms/83xx/suspend.c | |||
@@ -96,6 +96,7 @@ int fsl_deep_sleep(void) | |||
96 | { | 96 | { |
97 | return deep_sleeping; | 97 | return deep_sleeping; |
98 | } | 98 | } |
99 | EXPORT_SYMBOL(fsl_deep_sleep); | ||
99 | 100 | ||
100 | static int mpc83xx_change_state(void) | 101 | static int mpc83xx_change_state(void) |
101 | { | 102 | { |
diff --git a/include/linux/fsl_devices.h b/include/linux/fsl_devices.h index 39fd94681e74..47188d512b8f 100644 --- a/include/linux/fsl_devices.h +++ b/include/linux/fsl_devices.h | |||
@@ -90,6 +90,10 @@ struct mpc8xx_pcmcia_ops { | |||
90 | * lead to a deep sleep (i.e. power removed from the core, | 90 | * lead to a deep sleep (i.e. power removed from the core, |
91 | * instead of just the clock). | 91 | * instead of just the clock). |
92 | */ | 92 | */ |
93 | #if defined(CONFIG_PPC_83xx) && defined(CONFIG_SUSPEND) | ||
93 | int fsl_deep_sleep(void); | 94 | int fsl_deep_sleep(void); |
95 | #else | ||
96 | static inline int fsl_deep_sleep(void) { return 0; } | ||
97 | #endif | ||
94 | 98 | ||
95 | #endif /* _FSL_DEVICE_H_ */ | 99 | #endif /* _FSL_DEVICE_H_ */ |