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>
git-mirror · Nov 12, 2009 · 2e9d546 · 2e9d546
1 parent 1f8a25d
commit 2e9d546
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/arch/powerpc/platforms/83xx/suspend.c b/arch/powerpc/platforms/83xx/suspend.c
@@ -96,6 +96,7 @@ int fsl_deep_sleep(void)
 {
 	return deep_sleeping;
 }
+EXPORT_SYMBOL(fsl_deep_sleep);
 
 static int mpc83xx_change_state(void)
 {

diff --git a/include/linux/fsl_devices.h b/include/linux/fsl_devices.h
@@ -90,6 +90,10 @@ struct mpc8xx_pcmcia_ops {
  * lead to a deep sleep (i.e. power removed from the core,
  * instead of just the clock).
  */
+#if defined(CONFIG_PPC_83xx) && defined(CONFIG_SUSPEND)
 int fsl_deep_sleep(void);
+#else
+static inline int fsl_deep_sleep(void) { return 0; }
+#endif
 
 #endif /* _FSL_DEVICE_H_ */
-Original file line number
+Diff line change
@@ Expand Up / @@ -96,6 +96,7 @@ int fsl_deep_sleep(void) @@
     {
     	return deep_sleeping;
     }
+    EXPORT_SYMBOL(fsl_deep_sleep);
     static int mpc83xx_change_state(void)
     {
@@ Expand Down @@