ARM64: zynqmp: Sync zynq_sdhci_init() declaration
Subsystems (2)
PATCH 1/1 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 <[email protected]>
---
arch/arm/include/asm/arch-zynqmp/sys_proto.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/include/asm/arch-zynqmp/sys_proto.h +1 -1
@@ -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 );
Signature · 1 line
2.5.0
PATCH 1/1 ARM64: zynqmp: Sync zynq_sdhci_init() declaration
Quoted 4 lines · Michal Simek
This patch fix compilation error:
drivers/mmc/zynq_sdhci.c:16:5: error: conflicting types for ?zynq_sdhci_init?
intzynq_sdhci_init(phys_addr_t regbase)
Quoted 8 lines
^ 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 <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20151107/64a02a36/attachment.sig>