diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-09-01 00:06:05 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-09-01 00:06:05 +0200 |
| commit | a13b2d937941f6b525abfcfad96c034f94421188 (patch) | |
| tree | 56e5bdaf62397b2f8cc2be9b17a035d9b059bf8a /net | |
| parent | e155c9e00b5f21a6de28479259c440ba71289d00 (diff) | |
| parent | d6e04258be8f2408845468d3cf722a4cf0433445 (diff) | |
| download | u-boot-imx-a13b2d937941f6b525abfcfad96c034f94421188.zip u-boot-imx-a13b2d937941f6b525abfcfad96c034f94421188.tar.gz u-boot-imx-a13b2d937941f6b525abfcfad96c034f94421188.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'net')
| -rw-r--r-- | net/eth.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -576,7 +576,7 @@ extern int at91rm9200_miiphy_initialize(bd_t *bis); extern int emac4xx_miiphy_initialize(bd_t *bis); extern int mcf52x2_miiphy_initialize(bd_t *bis); extern int ns7520_miiphy_initialize(bd_t *bis); -extern int dm644x_eth_miiphy_initialize(bd_t *bis); +extern int davinci_eth_miiphy_initialize(bd_t *bis); int eth_initialize(bd_t *bis) @@ -599,7 +599,7 @@ int eth_initialize(bd_t *bis) ns7520_miiphy_initialize(bis); #endif #if defined(CONFIG_DRIVER_TI_EMAC) - dm644x_eth_miiphy_initialize(bis); + davinci_eth_miiphy_initialize(bis); #endif return 0; } |