commit 729b4d4ce1982c52040bbf22d6711cdf8db07ad8
author Alexey Starikovskiy <alexey.y.starikovskiy@intel.com> Thu Dec 01 04:29:00 2005 -0500
committer Len Brown <len.brown@intel.com> Thu Dec 15 13:28:14 2005 -0500
tree 1ae8b12dcbcd17c364f2df28db8ab3db9c8b89a2
parent 7116317dc9148d783846299fc80a7d377baa6dca

[ACPI] fix reboot upon suspend-to-disk

http://bugzilla.kernel.org/show_bug.cgi?id=4320

Signed-off-by: Alexey Starikovskiy <alexey.y.starikovskiy@intel.com>
Acked-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: Len Brown <len.brown@intel.com>

include/linux/reboot.h

diff --git a/include/linux/reboot.h b/include/linux/reboot.h
index 7ab2cdb..015297f 100644
--- a/include/linux/reboot.h
+++ b/include/linux/reboot.h
@@ -60,8 +60,7 @@
  */
 
 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);