Merge /pub/scm/linux/kernel/git/torvalds/linux-2.6

[karo-tx-linux.git] / include / linux / reboot.h

diff --git a/include/linux/reboot.h b/include/linux/reboot.h
index 3b3266ff1a9508ba1edbb96600cfc280e5fdbef0..1dd1c707311fa0f1e5683547540d1f3edac48e21 100644 (file)
--- a/include/linux/reboot.h
+++ b/include/linux/reboot.h
@@ -59,10 +59,13 @@ extern void machine_crash_shutdown(struct pt_regs *);
  * Architecture independent implemenations of sys_reboot commands.
  */
 
+extern void kernel_shutdown_prepare(enum system_states state);
+
 extern void kernel_restart(char *cmd);
 extern void kernel_halt(void);
 extern void kernel_power_off(void);
-extern void kernel_kexec(void);
+
+void ctrl_alt_del(void);
 
 /*
  * Emergency restart, callable from an interrupt handler.