summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorVincent Stehlé <vincent.stehle@freescale.com>2013-06-27 14:42:41 +0200
committerOlof Johansson <olof@lixom.net>2013-07-23 11:04:04 -0700
commitfe08bf9f46d6ae8e08de32d29234a2c928eebf8f (patch)
tree9304789a1869b618e2bf1cea308561edca8ad795 /arch
parented882c3e72d6037589baa4328585c2b0450e673c (diff)
downloadlinux-stable-fe08bf9f46d6ae8e08de32d29234a2c928eebf8f.tar.gz
linux-stable-fe08bf9f46d6ae8e08de32d29234a2c928eebf8f.tar.bz2
linux-stable-fe08bf9f46d6ae8e08de32d29234a2c928eebf8f.zip
ARM: zynq: fix compilation warning
Fix the following compilation warning: arch/arm/mach-zynq/common.c:110:2: warning: initialization from incompatible pointer type [enabled by default] arch/arm/mach-zynq/common.c:110:2: warning: (near initialization for ‘__mach_desc_XILINX_EP107.restart’) [enabled by default] Signed-off-by: Vincent Stehlé <vincent.stehle@freescale.com> Cc: Robin Holt <holt@sgi.com> Cc: Michal Simek <michal.simek@xilinx.com> Cc: Russell King <linux@arm.linux.org.uk> Cc: trivial@kernel.org Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-zynq/common.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-zynq/common.c b/arch/arm/mach-zynq/common.c
index 5b799c29886e..5f252569c689 100644
--- a/arch/arm/mach-zynq/common.c
+++ b/arch/arm/mach-zynq/common.c
@@ -91,7 +91,7 @@ static void __init zynq_map_io(void)
zynq_scu_map_io();
}
-static void zynq_system_reset(char mode, const char *cmd)
+static void zynq_system_reset(enum reboot_mode mode, const char *cmd)
{
zynq_slcr_system_reset();
}