Pull misc into release branch

[linux-2.6-omap-h63xx.git] / include / asm-powerpc / ps3.h

diff --git a/include/asm-powerpc/ps3.h b/include/asm-powerpc/ps3.h
index 433c38eb61aeda9810a73e821b9dc8563ba4e9fb..a6f3f5ee7ca7f70a3ee592c0e173f91b40f3e53b 100644 (file)
--- a/include/asm-powerpc/ps3.h
+++ b/include/asm-powerpc/ps3.h
@@ -409,13 +409,15 @@ extern struct bus_type ps3_system_bus_type;
 
 /* system manager */
 
-#ifdef CONFIG_PS3_SYS_MANAGER
-void ps3_sys_manager_restart(void);
+struct ps3_sys_manager_ops {
+       struct ps3_system_bus_device *dev;
+       void (*power_off)(struct ps3_system_bus_device *dev);
+       void (*restart)(struct ps3_system_bus_device *dev);
+};
+
+void ps3_sys_manager_register_ops(const struct ps3_sys_manager_ops *ops);
 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
+void ps3_sys_manager_restart(void);
 
 struct ps3_prealloc {
     const char *name;
@@ -425,5 +427,7 @@ struct ps3_prealloc {
 };
 
 extern struct ps3_prealloc ps3fb_videomemory;
+extern struct ps3_prealloc ps3flash_bounce_buffer;
+
 
 #endif