aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/reboot.h
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2013-12-29 00:37:03 -0500
committerOlof Johansson <olof@lixom.net>2013-12-29 00:38:16 -0500
commitfe5a365cdb9cc925d5ce86a5bb4509dca57f3894 (patch)
tree8dd536be0e16e86109295142edd1ef1fd18c2e98 /include/linux/reboot.h
parent4d77ce6c1fcae189dcd6fb0c7342f1c901b50a70 (diff)
parent413541dd66d51f791a0b169d9b9014e4f56be13c (diff)
Merge tag 'v3.13-rc5' into next/boards
Need a newer base version to get a regulator fix for Samsung platforms that they enable building in a defconfig. Linux 3.13-rc5
Diffstat (limited to 'include/linux/reboot.h')
-rw-r--r--include/linux/reboot.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/reboot.h b/include/linux/reboot.h
index 8e00f9f6f963..9e7db9e73cc1 100644
--- a/include/linux/reboot.h
+++ b/include/linux/reboot.h
@@ -43,6 +43,7 @@ extern int unregister_reboot_notifier(struct notifier_block *);
43 * Architecture-specific implementations of sys_reboot commands. 43 * Architecture-specific implementations of sys_reboot commands.
44 */ 44 */
45 45
46extern void migrate_to_reboot_cpu(void);
46extern void machine_restart(char *cmd); 47extern void machine_restart(char *cmd);
47extern void machine_halt(void); 48extern void machine_halt(void);
48extern void machine_power_off(void); 49extern void machine_power_off(void);