Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus

[deliverable/linux.git] / include / linux / reboot.h

diff --git a/include/linux/reboot.h b/include/linux/reboot.h
index 85ea63f462af39fe0b589ac236baae4ee2831b39..b93b541cf111d08701c40939b9f201429a213e56 100644 (file)
--- a/include/linux/reboot.h
+++ b/include/linux/reboot.h
@@ -59,8 +59,6 @@ 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);