projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master'
[powerpc.git]
/
include
/
linux
/
reboot.h
diff --git
a/include/linux/reboot.h
b/include/linux/reboot.h
index
7ab2cdb
..
015297f
100644
(file)
--- a/
include/linux/reboot.h
+++ b/
include/linux/reboot.h
@@
-60,8
+60,7
@@
extern void machine_crash_shutdown(struct pt_regs *);
*/
extern void kernel_restart_prepare(char *cmd);
*/
extern void kernel_restart_prepare(char *cmd);
-extern void kernel_halt_prepare(void);
-extern void kernel_power_off_prepare(void);
+extern void kernel_shutdown_prepare(enum system_states state);
extern void kernel_restart(char *cmd);
extern void kernel_halt(void);
extern void kernel_restart(char *cmd);
extern void kernel_halt(void);