diff options
| author | Stefan Roese <sr@denx.de> | 2006-11-30 13:08:32 +0100 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2006-11-30 13:08:32 +0100 |
| commit | 5c97aeb8d8b780b10a1cb0beaca196c009f5a62a (patch) | |
| tree | 07b2f5b8692461d84048ddd3c31e88c7d2e1d6f3 /net/eth.c | |
| parent | b690b7da0fdaa6055e94a82fdb468a1aa8771246 (diff) | |
| parent | 8d9a8610b8256331132227e9e6585c6bd5742787 (diff) | |
Merge with git+ssh://sr@pollux.denx.org/home/sr/git/u-boot/denx/.git
Diffstat (limited to 'net/eth.c')
| -rw-r--r-- | net/eth.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/net/eth.c b/net/eth.c index e8ac251a4fe..1e6a1c97ab8 100644 --- a/net/eth.c +++ b/net/eth.c @@ -142,13 +142,10 @@ int eth_initialize(bd_t *bis) miiphy_init(); #endif -#ifdef CONFIG_DB64360 +#if defined(CONFIG_DB64360) || defined(CONFIG_CPCI750) mv6436x_eth_initialize(bis); #endif -#ifdef CONFIG_CPCI750 - mv6436x_eth_initialize(bis); -#endif -#ifdef CONFIG_DB64460 +#if defined(CONFIG_DB64460) || defined(CONFIG_P3Mx) mv6446x_eth_initialize(bis); #endif #if defined(CONFIG_4xx) && !defined(CONFIG_IOP480) && !defined(CONFIG_AP1000) |