diff options
author | Robin Holt <holt@sgi.com> | 2013-07-08 19:01:40 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-09 13:33:29 -0400 |
commit | 7b6d864b48d95e6ea1df7df64475b9cb9616dcf9 (patch) | |
tree | bc5b3c1c6021e19e51f7f5afe5fb0fbbaef9f7a3 /arch/arm/mach-w90x900/cpu.c | |
parent | 16d6d5b00ee75307bab7e4ede9452c97b28f30e2 (diff) |
reboot: arm: change reboot_mode to use enum reboot_mode
Preparing to move the parsing of reboot= to generic kernel code forces
the change in reboot_mode handling to use the enum.
[akpm@linux-foundation.org: fix arch/arm/mach-socfpga/socfpga.c]
Signed-off-by: Robin Holt <holt@sgi.com>
Cc: Russell King <rmk+kernel@arm.linux.org.uk>
Cc: Russ Anderson <rja@sgi.com>
Cc: Robin Holt <holt@sgi.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Guan Xuetao <gxt@mprc.pku.edu.cn>
Acked-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/arm/mach-w90x900/cpu.c')
-rw-r--r-- | arch/arm/mach-w90x900/cpu.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-w90x900/cpu.c b/arch/arm/mach-w90x900/cpu.c index 9e4dd8b63c4a..b1eabaad50a5 100644 --- a/arch/arm/mach-w90x900/cpu.c +++ b/arch/arm/mach-w90x900/cpu.c | |||
@@ -230,9 +230,9 @@ void __init nuc900_init_clocks(void) | |||
230 | #define WTE (1 << 7) | 230 | #define WTE (1 << 7) |
231 | #define WTRE (1 << 1) | 231 | #define WTRE (1 << 1) |
232 | 232 | ||
233 | void nuc9xx_restart(char mode, const char *cmd) | 233 | void nuc9xx_restart(enum reboot_mode mode, const char *cmd) |
234 | { | 234 | { |
235 | if (mode == 's') { | 235 | if (mode == REBOOT_SOFT) { |
236 | /* Jump into ROM at address 0 */ | 236 | /* Jump into ROM at address 0 */ |
237 | soft_restart(0); | 237 | soft_restart(0); |
238 | } else { | 238 | } else { |