diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-07-28 10:12:45 +0200 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-07-28 10:12:45 +0200 |
| commit | 740f41d3cbefe2068247852220226c2c3b287249 (patch) | |
| tree | a8afb3f0e3f0b7d4574cbbfd2e8d780db6b4ae08 /include/netdev.h | |
| parent | f2c8d7f591e28d3437155c7a6eae8c8d9e3fe552 (diff) | |
| parent | 7c48b015100eeff0e1bbb766394f7beca23afb48 (diff) | |
| download | u-boot-imx-740f41d3cbefe2068247852220226c2c3b287249.zip u-boot-imx-740f41d3cbefe2068247852220226c2c3b287249.tar.gz u-boot-imx-740f41d3cbefe2068247852220226c2c3b287249.tar.bz2 | |
Merge branch 'u-boot-sunxi/master' into 'u-boot-arm/master'
Diffstat (limited to 'include/netdev.h')
| -rw-r--r-- | include/netdev.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/netdev.h b/include/netdev.h index 63481ec..e45dd7a 100644 --- a/include/netdev.h +++ b/include/netdev.h @@ -78,8 +78,8 @@ int sh_eth_initialize(bd_t *bis); int skge_initialize(bd_t *bis); int smc91111_initialize(u8 dev_num, int base_addr); int smc911x_initialize(u8 dev_num, int base_addr); +int sunxi_emac_initialize(bd_t *bis); int sunxi_gmac_initialize(bd_t *bis); -int sunxi_wemac_initialize(bd_t *bis); int tsi108_eth_initialize(bd_t *bis); int uec_standard_init(bd_t *bis); int uli526x_initialize(bd_t *bis); |