diff options
| author | Wolfgang Denk <wd@pollux.denx.de> | 2005-08-23 23:03:20 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@pollux.denx.de> | 2005-08-23 23:03:20 +0200 |
| commit | ec2e5a2ccea77102ba7357d31d5670b4467967d3 (patch) | |
| tree | c6d27b5e69309850a0d45b9899f823fb0227bea4 /net | |
| parent | 2ac4785c2fc5289780f63a00d9b9a75dd658b15e (diff) | |
| parent | d6c61aabc49c22a5c040f046fdc04dc478ed071f (diff) | |
| download | u-boot-imx-ec2e5a2ccea77102ba7357d31d5670b4467967d3.zip u-boot-imx-ec2e5a2ccea77102ba7357d31d5670b4467967d3.tar.gz u-boot-imx-ec2e5a2ccea77102ba7357d31d5670b4467967d3.tar.bz2 | |
Merge with testing-4xx_enet (Create generic 4xx Ethernet code)
Diffstat (limited to 'net')
| -rw-r--r-- | net/eth.c | 7 |
1 files changed, 1 insertions, 6 deletions
@@ -47,7 +47,6 @@ extern int ns8382x_initialize(bd_t*); extern int pcnet_initialize(bd_t*); extern int plb2800_eth_initialize(bd_t*); extern int ppc_4xx_eth_initialize(bd_t *); -extern int ppc_440x_eth_initialize(bd_t *); extern int rtl8139_initialize(bd_t*); extern int rtl8169_initialize(bd_t*); extern int scc_initialize(bd_t*); @@ -126,13 +125,9 @@ int eth_initialize(bd_t *bis) #ifdef CONFIG_DB64460 mv6446x_eth_initialize(bis); #endif -#if defined(CONFIG_405GP) || defined(CONFIG_405EP) || \ - ( defined(CONFIG_440) && !defined(CONFIG_NET_MULTI) ) +#if defined(CONFIG_4xx) && !defined(CONFIG_IOP480) ppc_4xx_eth_initialize(bis); #endif -#if defined(CONFIG_440) && defined(CONFIG_NET_MULTI) - ppc_440x_eth_initialize(bis); -#endif #ifdef CONFIG_INCA_IP_SWITCH inca_switch_initialize(bis); #endif |