summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichal Simek <michal.simek@xilinx.com>2015-11-05 17:06:29 +0100
committerTom Rini <trini@konsulko.com>2015-11-07 08:17:54 -0500
commite490ad25eb3dc4f075ed33b4b00b1f97071fcf3d (patch)
tree4d777f8fec7f87ba174a28ea6c714905e2544cde
parent4ca0c3c993436cca743ed521e7f3d784d7fe31c8 (diff)
downloadtalos-obmc-uboot-e490ad25eb3dc4f075ed33b4b00b1f97071fcf3d.tar.gz
talos-obmc-uboot-e490ad25eb3dc4f075ed33b4b00b1f97071fcf3d.zip
ARM64: zynqmp: Sync zynq_sdhci_init() declaration
This patch fix compilation error: drivers/mmc/zynq_sdhci.c:16:5: error: conflicting types for ‘zynq_sdhci_init’ int zynq_sdhci_init(phys_addr_t regbase) ^ In file included from drivers/mmc/zynq_sdhci.c:14:0: ./arch/arm/include/asm/arch/sys_proto.h:16:5: note: previous declaration of ‘zynq_sdhci_init’ was here int zynq_sdhci_init(unsigned long regbase); ^ Signed-off-by: Michal Simek <michal.simek@xilinx.com>
-rw-r--r--arch/arm/include/asm/arch-zynqmp/sys_proto.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/include/asm/arch-zynqmp/sys_proto.h b/arch/arm/include/asm/arch-zynqmp/sys_proto.h
index f5c90d11dc..f1e95a2a28 100644
--- a/arch/arm/include/asm/arch-zynqmp/sys_proto.h
+++ b/arch/arm/include/asm/arch-zynqmp/sys_proto.h
@@ -13,7 +13,7 @@ static inline void zynq_slcr_gem_clk_setup(u32 gem_id, unsigned long clk_rate)
{
}
-int zynq_sdhci_init(unsigned long regbase);
+int zynq_sdhci_init(phys_addr_t regbase);
int zynq_slcr_get_mio_pin_status(const char *periph);
unsigned int zynqmp_get_silicon_version(void);
OpenPOWER on IntegriCloud