diff mbox

ARM:Gemini:fix compiler waring

Message ID 1431020068-19821-1-git-send-email-ulli.kroll@googlemail.com (mailing list archive)
State New, archived
Headers show

Commit Message

Hans Ulli Kroll May 7, 2015, 5:34 p.m. UTC
Signed-off-by: Hans Ulli Kroll <ulli.kroll@googlemail.com>
---
 arch/arm/mach-gemini/common.h | 4 +++-
 arch/arm/mach-gemini/reset.c  | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

Comments

Arnd Bergmann May 8, 2015, 1:24 p.m. UTC | #1
On Thursday 07 May 2015 19:34:28 Hans Ulli Kroll wrote:
> Signed-off-by: Hans Ulli Kroll <ulli.kroll@googlemail.com>
> 

Can you re-send that patch with a description of what warning it fixes?

The patch looks reasonable, but we really want all patches we merge to
have a changelog.

	Arnd
diff mbox

Patch

diff --git a/arch/arm/mach-gemini/common.h b/arch/arm/mach-gemini/common.h
index 38a4526..dd88369 100644
--- a/arch/arm/mach-gemini/common.h
+++ b/arch/arm/mach-gemini/common.h
@@ -12,6 +12,8 @@ 
 #ifndef __GEMINI_COMMON_H__
 #define __GEMINI_COMMON_H__
 
+#include <linux/reboot.h>
+
 struct mtd_partition;
 
 extern void gemini_map_io(void);
@@ -26,6 +28,6 @@  extern int platform_register_pflash(unsigned int size,
 				    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__ */
diff --git a/arch/arm/mach-gemini/reset.c b/arch/arm/mach-gemini/reset.c
index b266597..21a6d6d 100644
--- a/arch/arm/mach-gemini/reset.c
+++ b/arch/arm/mach-gemini/reset.c
@@ -14,7 +14,9 @@ 
 #include <mach/hardware.h>
 #include <mach/global_reg.h>
 
-void gemini_restart(char mode, const char *cmd)
+#include "common.h"
+
+void gemini_restart(enum reboot_mode mode, const char *cmd)
 {
 	__raw_writel(RESET_GLOBAL | RESET_CPU1,
 		     IO_ADDRESS(GEMINI_GLOBAL_BASE) + GLOBAL_RESET);