diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-07-05 14:11:10 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-07-05 14:11:10 +1000 |
| commit | 92221d1fc707b50772262839aef545c1f5fbc94e (patch) | |
| tree | e579d1228a662e47345cea17e89fb2607263b0b1 /arch/arm/mach-s3c64xx/common.c | |
| parent | 3d8360d3556c1d98ea4ac130aed70db4a8f25f65 (diff) | |
| parent | a32473271de52a37a39a941c5cd25970d8bcdf43 (diff) | |
Merge branch 'akpm/master'
Diffstat (limited to 'arch/arm/mach-s3c64xx/common.c')
| -rw-r--r-- | arch/arm/mach-s3c64xx/common.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-s3c64xx/common.c b/arch/arm/mach-s3c64xx/common.c index 1aed6f4be1ce..3f62e467b129 100644 --- a/arch/arm/mach-s3c64xx/common.c +++ b/arch/arm/mach-s3c64xx/common.c @@ -21,6 +21,7 @@ #include <linux/ioport.h> #include <linux/serial_core.h> #include <linux/platform_device.h> +#include <linux/reboot.h> #include <linux/io.h> #include <linux/dma-mapping.h> #include <linux/irq.h> @@ -381,9 +382,9 @@ static int __init s3c64xx_init_irq_eint(void) } arch_initcall(s3c64xx_init_irq_eint); -void s3c64xx_restart(char mode, const char *cmd) +void s3c64xx_restart(enum reboot_mode mode, const char *cmd) { - if (mode != 's') + if (mode != REBOOT_SOFT) samsung_wdt_reset(); /* if all else fails, or mode was for soft, jump to 0 */ |