diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-07-19 11:34:42 +0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-07-19 11:34:42 +0400 |
| commit | e43fff2b98b4e99b189c086a9cf740b19eaf3538 (patch) | |
| tree | 658a5f73d5806fe47856547b17cbd23592856c62 /arch/arm/mach-lpc32xx/common.c | |
| parent | 67516844625f45f0ce148a01c27bf41f591872b2 (diff) | |
| parent | ecb2cf1a6b63825a258ff4fe0d7f3070fbe4676b (diff) | |
| download | linux-e43fff2b98b4e99b189c086a9cf740b19eaf3538.tar.xz | |
Merge branch 'linus' into perf/core
Merge in a v3.11-rc1-ish branch to go from v3.10 based development
to a v3.11 based one.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arm/mach-lpc32xx/common.c')
| -rw-r--r-- | arch/arm/mach-lpc32xx/common.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-lpc32xx/common.c b/arch/arm/mach-lpc32xx/common.c index 0d4db8c544b5..d7aa54c25c59 100644 --- a/arch/arm/mach-lpc32xx/common.c +++ b/arch/arm/mach-lpc32xx/common.c @@ -207,11 +207,11 @@ void __init lpc32xx_map_io(void) iotable_init(lpc32xx_io_desc, ARRAY_SIZE(lpc32xx_io_desc)); } -void lpc23xx_restart(char mode, const char *cmd) +void lpc23xx_restart(enum reboot_mode mode, const char *cmd) { switch (mode) { - case 's': - case 'h': + case REBOOT_SOFT: + case REBOOT_HARD: lpc32xx_watchdog_reset(); break; |