summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorMike Turquette <mturquette@linaro.org>2014-10-01 22:19:10 +0400
committerMike Turquette <mturquette@linaro.org>2014-10-01 22:19:10 +0400
commita7979009500df9766ba7d78554a6da9dea18dc26 (patch)
tree81bc6683d6a4c35761a64fb1c2eeaf59af1aff9f /include/linux
parente156ee56cbe26c9e8df6619dac1a993245afc1d5 (diff)
parente317c19470f6d690122519bf9ed1c9f21ea11906 (diff)
downloadlinux-a7979009500df9766ba7d78554a6da9dea18dc26.tar.xz
Merge tag 'v3.18-rockchip-clk2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into clk-next
Allow parent rate changes for i2s on rk3288 and rockchip as well as s3c24xx restart handlers.
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/reboot.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/reboot.h b/include/linux/reboot.h
index 48bf152761c7..67fc8fcdc4b0 100644
--- a/include/linux/reboot.h
+++ b/include/linux/reboot.h
@@ -38,6 +38,9 @@ extern int reboot_force;
extern int register_reboot_notifier(struct notifier_block *);
extern int unregister_reboot_notifier(struct notifier_block *);
+extern int register_restart_handler(struct notifier_block *);
+extern int unregister_restart_handler(struct notifier_block *);
+extern void do_kernel_restart(char *cmd);
/*
* Architecture-specific implementations of sys_reboot commands.