aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-dove
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-dove
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-dove')
-rw-r--r--arch/arm/mach-dove/common.c2
-rw-r--r--arch/arm/mach-dove/common.h4
2 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/mach-dove/common.c b/arch/arm/mach-dove/common.c
index 2a9443d04d92..00247c771313 100644
--- a/arch/arm/mach-dove/common.c
+++ b/arch/arm/mach-dove/common.c
@@ -381,7 +381,7 @@ void __init dove_init(void)
381 dove_xor1_init(); 381 dove_xor1_init();
382} 382}
383 383
384void dove_restart(char mode, const char *cmd) 384void dove_restart(enum reboot_mode mode, const char *cmd)
385{ 385{
386 /* 386 /*
387 * Enable soft reset to assert RSTOUTn. 387 * Enable soft reset to assert RSTOUTn.
diff --git a/arch/arm/mach-dove/common.h b/arch/arm/mach-dove/common.h
index e86347928b67..1d725224d146 100644
--- a/arch/arm/mach-dove/common.h
+++ b/arch/arm/mach-dove/common.h
@@ -11,6 +11,8 @@
11#ifndef __ARCH_DOVE_COMMON_H 11#ifndef __ARCH_DOVE_COMMON_H
12#define __ARCH_DOVE_COMMON_H 12#define __ARCH_DOVE_COMMON_H
13 13
14#include <linux/reboot.h>
15
14struct mv643xx_eth_platform_data; 16struct mv643xx_eth_platform_data;
15struct mv_sata_platform_data; 17struct mv_sata_platform_data;
16 18
@@ -42,6 +44,6 @@ void dove_spi1_init(void);
42void dove_i2c_init(void); 44void dove_i2c_init(void);
43void dove_sdio0_init(void); 45void dove_sdio0_init(void);
44void dove_sdio1_init(void); 46void dove_sdio1_init(void);
45void dove_restart(char, const char *); 47void dove_restart(enum reboot_mode, const char *);
46 48
47#endif 49#endif