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-s3c64xx/common.h | |
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-s3c64xx/common.h')
-rw-r--r-- | arch/arm/mach-s3c64xx/common.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c64xx/common.h b/arch/arm/mach-s3c64xx/common.h index 6cfc99bdfb37..e8f990b37665 100644 --- a/arch/arm/mach-s3c64xx/common.h +++ b/arch/arm/mach-s3c64xx/common.h | |||
@@ -17,13 +17,15 @@ | |||
17 | #ifndef __ARCH_ARM_MACH_S3C64XX_COMMON_H | 17 | #ifndef __ARCH_ARM_MACH_S3C64XX_COMMON_H |
18 | #define __ARCH_ARM_MACH_S3C64XX_COMMON_H | 18 | #define __ARCH_ARM_MACH_S3C64XX_COMMON_H |
19 | 19 | ||
20 | #include <linux/reboot.h> | ||
21 | |||
20 | void s3c64xx_init_irq(u32 vic0, u32 vic1); | 22 | void s3c64xx_init_irq(u32 vic0, u32 vic1); |
21 | void s3c64xx_init_io(struct map_desc *mach_desc, int size); | 23 | void s3c64xx_init_io(struct map_desc *mach_desc, int size); |
22 | 24 | ||
23 | void s3c64xx_register_clocks(unsigned long xtal, unsigned armclk_limit); | 25 | void s3c64xx_register_clocks(unsigned long xtal, unsigned armclk_limit); |
24 | void s3c64xx_setup_clocks(void); | 26 | void s3c64xx_setup_clocks(void); |
25 | 27 | ||
26 | void s3c64xx_restart(char mode, const char *cmd); | 28 | void s3c64xx_restart(enum reboot_mode mode, const char *cmd); |
27 | void s3c64xx_init_late(void); | 29 | void s3c64xx_init_late(void); |
28 | 30 | ||
29 | #ifdef CONFIG_CPU_S3C6400 | 31 | #ifdef CONFIG_CPU_S3C6400 |