From: Anton Vorontsov <avorontsov@ru.mvista.com>
Date: Wed, 23 Sep 2009 18:52:38 +0000 (+0400)
Subject: powerpc/fsl: Make fsl_deep_sleep() usable w/ modules and non-83xx builds
X-Git-Tag: v2.6.33-rc1~293^2~64
X-Git-Url: http://bbs.cooldavid.org/git/?a=commitdiff_plain;h=2e9d546eda5888962a441da1e96bbf92cb5b1cbb;p=net-next-2.6.git

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>
---

diff --git a/arch/powerpc/platforms/83xx/suspend.c b/arch/powerpc/platforms/83xx/suspend.c
index 08e65fc8b98..d306f07b9aa 100644
--- 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
index 39fd94681e7..47188d512b8 100644
--- 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_ */