diff options
| author | Tom Rini <trini@ti.com> | 2015-01-22 09:51:18 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2015-01-22 09:51:18 -0500 |
| commit | 65afbbde6bd4429add8a644d8e2adbdbb812f7ec (patch) | |
| tree | 303a995164f8f91f59f2f0126f792a1155bb7932 /include | |
| parent | 4608f37918e5d93d6b2b6909b325a5e6fb0a2346 (diff) | |
| parent | 38cd2d9c9b6a252c413cb91fbc4496797e425dc2 (diff) | |
| download | talos-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 'include')
| -rw-r--r-- | include/netdev.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/netdev.h b/include/netdev.h index 34651ab377..daffc1222d 100644 --- a/include/netdev.h +++ b/include/netdev.h @@ -93,7 +93,8 @@ int xilinx_emaclite_initialize(bd_t *bis, unsigned long base_addr, int xilinx_ll_temac_eth_init(bd_t *bis, unsigned long base_addr, int flags, unsigned long ctrl_addr); int zynq_gem_of_init(const void *blob); -int zynq_gem_initialize(bd_t *bis, int base_addr, int phy_addr, u32 emio); +int zynq_gem_initialize(bd_t *bis, phys_addr_t base_addr, + int phy_addr, u32 emio); /* * As long as the Xilinx xps_ll_temac ethernet driver has not its own interface * exported by a public hader file, we need a global definition at this point. |
