summaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2015-01-22 09:51:18 -0500
committerTom Rini <trini@ti.com>2015-01-22 09:51:18 -0500
commit65afbbde6bd4429add8a644d8e2adbdbb812f7ec (patch)
tree303a995164f8f91f59f2f0126f792a1155bb7932 /arch/arm
parent4608f37918e5d93d6b2b6909b325a5e6fb0a2346 (diff)
parent38cd2d9c9b6a252c413cb91fbc4496797e425dc2 (diff)
downloadtalos-obmc-uboot-65afbbde6bd4429add8a644d8e2adbdbb812f7ec.tar.gz
talos-obmc-uboot-65afbbde6bd4429add8a644d8e2adbdbb812f7ec.zip
Merge branch 'phys_t' of git://www.denx.de/git/u-boot-microblaze
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/include/asm/arch-zynq/sys_proto.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/include/asm/arch-zynq/sys_proto.h b/arch/arm/include/asm/arch-zynq/sys_proto.h
index 89c47f3bd3..9d50e2478f 100644
--- a/arch/arm/include/asm/arch-zynq/sys_proto.h
+++ b/arch/arm/include/asm/arch-zynq/sys_proto.h
@@ -20,7 +20,7 @@ extern void zynq_ddrc_init(void);
extern unsigned int zynq_get_silicon_version(void);
/* Driver extern functions */
-extern int zynq_sdhci_init(u32 regbase);
+extern int zynq_sdhci_init(phys_addr_t regbase);
extern int zynq_sdhci_of_init(const void *blob);
extern void ps7_init(void);
OpenPOWER on IntegriCloud