diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-02-07 17:43:08 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-02-07 17:43:08 -0500 |
| commit | 8f75015f33c3005e0bbf83ffc0d5e0b4262cc03d (patch) | |
| tree | a3c34ad86ccdc904bb43af6cd1cb163231c29276 /include/linux/reboot.h | |
| parent | 076d022c566fddde41fd4a858dd24bacad8304d7 (diff) | |
| parent | e060e084e7d9e1c62d02cb6b8d3fe07db5317eaa (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
Diffstat (limited to 'include/linux/reboot.h')
| -rw-r--r-- | include/linux/reboot.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/reboot.h b/include/linux/reboot.h index 7ab2cdb83ef0..015297ff73fa 100644 --- a/include/linux/reboot.h +++ b/include/linux/reboot.h | |||
| @@ -60,8 +60,7 @@ extern void machine_crash_shutdown(struct pt_regs *); | |||
| 60 | */ | 60 | */ |
| 61 | 61 | ||
| 62 | extern void kernel_restart_prepare(char *cmd); | 62 | extern void kernel_restart_prepare(char *cmd); |
| 63 | extern void kernel_halt_prepare(void); | 63 | extern void kernel_shutdown_prepare(enum system_states state); |
| 64 | extern void kernel_power_off_prepare(void); | ||
| 65 | 64 | ||
| 66 | extern void kernel_restart(char *cmd); | 65 | extern void kernel_restart(char *cmd); |
| 67 | extern void kernel_halt(void); | 66 | extern void kernel_halt(void); |