diff --git a/[refs] b/[refs]
index eaa969153a85..260ead825bdb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1f8a25d4a461865c7f38e93dcecbee63b3968d21
+refs/heads/master: 2e9d546eda5888962a441da1e96bbf92cb5b1cbb
diff --git a/trunk/arch/powerpc/platforms/83xx/suspend.c b/trunk/arch/powerpc/platforms/83xx/suspend.c
index 08e65fc8b98c..d306f07b9aa1 100644
--- a/trunk/arch/powerpc/platforms/83xx/suspend.c
+++ b/trunk/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/trunk/include/linux/fsl_devices.h b/trunk/include/linux/fsl_devices.h
index 39fd94681e74..47188d512b8f 100644
--- a/trunk/include/linux/fsl_devices.h
+++ b/trunk/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_ */