310b70f03e
Changelogs: * https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.12 * https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.13 * https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.14 Build tested on brcm63xx and ipq806x, runtested on brcm63xx. Signed-off-by: Jonas Gorski <jogo@openwrt.org> SVN-Revision: 45711
26 lines
804 B
Diff
26 lines
804 B
Diff
--- a/arch/arm/mach-gemini/reset.c
|
|
+++ b/arch/arm/mach-gemini/reset.c
|
|
@@ -11,10 +11,11 @@
|
|
#define __MACH_SYSTEM_H
|
|
|
|
#include <linux/io.h>
|
|
+#include <linux/reboot.h>
|
|
#include <mach/hardware.h>
|
|
#include <mach/global_reg.h>
|
|
|
|
-void gemini_restart(char mode, const char *cmd)
|
|
+void gemini_restart(enum reboot_mode mode, const char *cmd)
|
|
{
|
|
__raw_writel(RESET_GLOBAL | RESET_CPU1,
|
|
IO_ADDRESS(GEMINI_GLOBAL_BASE) + GLOBAL_RESET);
|
|
--- a/arch/arm/mach-gemini/common.h
|
|
+++ b/arch/arm/mach-gemini/common.h
|
|
@@ -26,6 +26,6 @@ extern int platform_register_pflash(unsi
|
|
struct mtd_partition *parts,
|
|
unsigned int nr_parts);
|
|
|
|
-extern void gemini_restart(char mode, const char *cmd);
|
|
+extern void gemini_restart(enum reboot_mode mode, const char *cmd);
|
|
|
|
#endif /* __GEMINI_COMMON_H__ */
|