kernel: update 3.18 to 3.18.14
[openwrt/staging/chunkeey.git] / target / linux / gemini / patches-3.18 / 021-reset-parameters.patch
1 --- a/arch/arm/mach-gemini/reset.c
2 +++ b/arch/arm/mach-gemini/reset.c
3 @@ -11,10 +11,11 @@
4 #define __MACH_SYSTEM_H
5
6 #include <linux/io.h>
7 +#include <linux/reboot.h>
8 #include <mach/hardware.h>
9 #include <mach/global_reg.h>
10
11 -void gemini_restart(char mode, const char *cmd)
12 +void gemini_restart(enum reboot_mode mode, const char *cmd)
13 {
14 __raw_writel(RESET_GLOBAL | RESET_CPU1,
15 IO_ADDRESS(GEMINI_GLOBAL_BASE) + GLOBAL_RESET);
16 --- a/arch/arm/mach-gemini/common.h
17 +++ b/arch/arm/mach-gemini/common.h
18 @@ -26,6 +26,6 @@ extern int platform_register_pflash(unsi
19 struct mtd_partition *parts,
20 unsigned int nr_parts);
21
22 -extern void gemini_restart(char mode, const char *cmd);
23 +extern void gemini_restart(enum reboot_mode mode, const char *cmd);
24
25 #endif /* __GEMINI_COMMON_H__ */