You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
26 lines
835 B
Diff
26 lines
835 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 2014-08-23 07:06:06.014200638 -0500
|
|
+++ b/arch/arm/mach-gemini/common.h 2014-08-23 07:07:33.450536466 -0500
|
|
@@ -26,6 +26,6 @@
|
|
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__ */
|