Commit 4e753f66 authored by Hans Ulli Kroll's avatar Hans Ulli Kroll Committed by Luis Henriques

ARM: gemini: fix compiler warning due wrong data type

commit 31fc835f upstream.

This patch fixes a compiler warning in gemini_restart()
issued by commit 7b6d864b ("reboot:arm: reboot_mode
changes from char to enum reboot_mode").

arch/arm/mach-gemini/board-rut1xx.c:93:2: warning: initialization from incompatible pointer type

The warning is harmless, and the patch does not need to
be backported to stable kernels.

Fixes: 7b6d864b ("reboot:arm: reboot_mode changes from char to enum reboot_mode.")
Signed-off-by: default avatarHans Ulli Kroll <ulli.kroll@googlemail.com>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarLuis Henriques <luis.henriques@canonical.com>
parent e0f9de58
...@@ -12,6 +12,8 @@ ...@@ -12,6 +12,8 @@
#ifndef __GEMINI_COMMON_H__ #ifndef __GEMINI_COMMON_H__
#define __GEMINI_COMMON_H__ #define __GEMINI_COMMON_H__
#include <linux/reboot.h>
struct mtd_partition; struct mtd_partition;
extern void gemini_map_io(void); extern void gemini_map_io(void);
...@@ -26,6 +28,6 @@ extern int platform_register_pflash(unsigned int size, ...@@ -26,6 +28,6 @@ extern int platform_register_pflash(unsigned int size,
struct mtd_partition *parts, struct mtd_partition *parts,
unsigned int nr_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__ */ #endif /* __GEMINI_COMMON_H__ */
...@@ -14,7 +14,9 @@ ...@@ -14,7 +14,9 @@
#include <mach/hardware.h> #include <mach/hardware.h>
#include <mach/global_reg.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, __raw_writel(RESET_GLOBAL | RESET_CPU1,
IO_ADDRESS(GEMINI_GLOBAL_BASE) + GLOBAL_RESET); IO_ADDRESS(GEMINI_GLOBAL_BASE) + GLOBAL_RESET);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment