Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4319f78f authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'renesas-fixes2-for-v3.12' of... 

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: default avatarOlof Johansson <olof@lixom.net>
parents ea04dd3b ab40900b

arch/arm/mach-shmobile/board-armadillo800eva-reference.c

+2 −2
Original line number Diff line number Diff line
@@ -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 = {