diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-09-18 18:58:33 +0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-09-18 18:58:33 +0400 |
| commit | 4ba25a496f62129a2ad8c2436ab2b402752dc66c (patch) | |
| tree | 8abf41a79f293832a430a9609530c24cd365466c /drivers/power/reset/restart-poweroff.c | |
| parent | 390de835b61228abf6646f2b14530edca8d7512f (diff) | |
| parent | 6e4664525b1db28f8c4e1130957f70a94c19213e (diff) | |
| download | linux-4ba25a496f62129a2ad8c2436ab2b402752dc66c.tar.xz | |
Merge tag 'v3.11' into next
Merge with mainline to bring in sync changes to cyttsp4 driver.
Diffstat (limited to 'drivers/power/reset/restart-poweroff.c')
| -rw-r--r-- | drivers/power/reset/restart-poweroff.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/power/reset/restart-poweroff.c b/drivers/power/reset/restart-poweroff.c index 059cd1501e2a..5758033e0c16 100644 --- a/drivers/power/reset/restart-poweroff.c +++ b/drivers/power/reset/restart-poweroff.c @@ -15,11 +15,12 @@ #include <linux/platform_device.h> #include <linux/of_platform.h> #include <linux/module.h> +#include <linux/reboot.h> #include <asm/system_misc.h> static void restart_poweroff_do_poweroff(void) { - arm_pm_restart('h', NULL); + arm_pm_restart(REBOOT_HARD, NULL); } static int restart_poweroff_probe(struct platform_device *pdev) |