aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mxs
diff options
context:
space:
mode:
authorRobin Holt <holt@sgi.com>2013-07-08 19:01:40 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2013-07-09 13:33:29 -0400
commit7b6d864b48d95e6ea1df7df64475b9cb9616dcf9 (patch)
treebc5b3c1c6021e19e51f7f5afe5fb0fbbaef9f7a3 /arch/arm/mach-mxs
parent16d6d5b00ee75307bab7e4ede9452c97b28f30e2 (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-mxs')
-rw-r--r--arch/arm/mach-mxs/mach-mxs.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-mxs/mach-mxs.c b/arch/arm/mach-mxs/mach-mxs.c
index 7fa611c1b287..6298adb8d335 100644
--- a/arch/arm/mach-mxs/mach-mxs.c
+++ b/arch/arm/mach-mxs/mach-mxs.c
@@ -20,6 +20,7 @@
20#include <linux/gpio.h> 20#include <linux/gpio.h>
21#include <linux/init.h> 21#include <linux/init.h>
22#include <linux/irqchip/mxs.h> 22#include <linux/irqchip/mxs.h>
23#include <linux/reboot.h>
23#include <linux/micrel_phy.h> 24#include <linux/micrel_phy.h>
24#include <linux/of_address.h> 25#include <linux/of_address.h>
25#include <linux/of_platform.h> 26#include <linux/of_platform.h>
@@ -500,7 +501,7 @@ static void __init mxs_machine_init(void)
500/* 501/*
501 * Reset the system. It is called by machine_restart(). 502 * Reset the system. It is called by machine_restart().
502 */ 503 */
503static void mxs_restart(char mode, const char *cmd) 504static void mxs_restart(enum reboot_mode mode, const char *cmd)
504{ 505{
505 struct device_node *np; 506 struct device_node *np;
506 void __iomem *reset_addr; 507 void __iomem *reset_addr;