Merge tag 'renesas-fixes2-for-v3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/fixes-non-critical
From Simon Horman: Second Round of Renesas ARM based SoC fixes for v3.12 * Fix compiler warning in armadillo800eva board code * tag 'renesas-fixes2-for-v3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: armadillo800eva-reference: fix compiler warning Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
@@ -190,10 +190,10 @@ static void __init eva_init(void)
|
||||
}
|
||||
|
||||
#define RESCNT2 IOMEM(0xe6188020)
|
||||
static void eva_restart(char mode, const char *cmd)
|
||||
static void eva_restart(enum reboot_mode mode, const char *cmd)
|
||||
{
|
||||
/* Do soft power on reset */
|
||||
writel((1 << 31), RESCNT2);
|
||||
writel(1 << 31, RESCNT2);
|
||||
}
|
||||
|
||||
static const char *eva_boards_compat_dt[] __initdata = {
|
||||
|
||||
Reference in New Issue
Block a user