diff options
| author | Jon Loeliger <[email protected]> | 2007-08-13 11:01:52 -0500 |
|---|---|---|
| committer | Jon Loeliger <[email protected]> | 2007-08-13 11:01:52 -0500 |
| commit | 8e2dd87eee01bb1b83beab7caf22b851c5cafb2c (patch) | |
| tree | 47a43e05d90de7d64ed356bab5f15e8d89f5b5cc /net | |
| parent | cca34967cbd13ff6bd352be29e3f1cc88ab24c05 (diff) | |
| parent | 9986bc3e40e899bea372a99a2bca4071bdf2e24b (diff) | |
Merge commit 'remotes/wd/master'
Conflicts:
MAKEALL
With any luck, this is the last MAKEALL merge conflict!
Diffstat (limited to 'net')
| -rw-r--r-- | net/eth.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/net/eth.c b/net/eth.c index 6576ee405bb..c8f92a52634 100644 --- a/net/eth.c +++ b/net/eth.c @@ -464,6 +464,8 @@ 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); + int eth_initialize(bd_t *bis) { @@ -484,6 +486,9 @@ int eth_initialize(bd_t *bis) #if defined(CONFIG_NETARM) ns7520_miiphy_initialize(bis); #endif +#if defined(CONFIG_DRIVER_TI_EMAC) + dm644x_eth_miiphy_initialize(bis); +#endif return 0; } #endif |