diff --git a/[refs] b/[refs]
index 8d103995d3f3..df9847f0e275 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 17213c3bf67bd532d4d04c286663f9bbf92b9c18
+refs/heads/master: 6e66837b2669d6c07177ada4db9ec47ce9c31873
diff --git a/trunk/include/asm-powerpc/ps3.h b/trunk/include/asm-powerpc/ps3.h
index 13c372df99e8..1e04651eedc4 100644
--- a/trunk/include/asm-powerpc/ps3.h
+++ b/trunk/include/asm-powerpc/ps3.h
@@ -377,8 +377,13 @@ int ps3_vuart_port_device_register(struct ps3_vuart_port_device *dev);
 
 /* system manager */
 
+#ifdef CONFIG_PS3_SYS_MANAGER
 void ps3_sys_manager_restart(void);
 void ps3_sys_manager_power_off(void);
+#else
+static inline void ps3_sys_manager_restart(void) {}
+static inline void ps3_sys_manager_power_off(void) {}
+#endif
 
 struct ps3_prealloc {
     const char *name;