diff options
| author |   Olof Johansson <olof@lixom.net> | 2013-08-14 00:59:27 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-08-14 00:59:46 -0700 |
| commit | 4319f78f422eb391bd7d63ccedbb8a2b1ab059df (patch) | |
| tree | 6cd4a4120d013ace44f8df745be734848c847105 | |
| parent | ARM: clps711x: edb7211: Remove extra iotable_init() call (diff) | |
| parent | ARM: shmobile: armadillo800eva-reference: fix compiler warning (diff) | |
| download | wireguard-linux-4319f78f422eb391bd7d63ccedbb8a2b1ab059df.tar.xz wireguard-linux-4319f78f422eb391bd7d63ccedbb8a2b1ab059df.zip | |
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>
| -rw-r--r-- | arch/arm/mach-shmobile/board-armadillo800eva-reference.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-shmobile/board-armadillo800eva-reference.c b/arch/arm/mach-shmobile/board-armadillo800eva-reference.c index 03b85fec2ddb..8f677df2d4c4 100644 --- a/arch/arm/mach-shmobile/board-armadillo800eva-reference.c +++ b/arch/arm/mach-shmobile/board-armadillo800eva-reference.c @@ -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 = { |