diff options
author | Wolfgang Denk <wd@denx.de> | 2009-07-23 19:20:26 +0200 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2009-07-23 19:20:26 +0200 |
commit | 4fb799aeafa71c4e6caacd3acdc4a4547cfbd5d4 (patch) | |
tree | 6c49be563c2bcf3d24af9279493a054b613999ff /drivers/net/4xx_enet.c | |
parent | b201171f2b4d509f3ad510b214bee70ff902e3d6 (diff) | |
parent | 97cfe86163505ea18e7ff7b71e78df5bb03dad57 (diff) |
Merge branch 'master' of git://git.denx.de/u-boot-net
Diffstat (limited to 'drivers/net/4xx_enet.c')
-rw-r--r-- | drivers/net/4xx_enet.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/4xx_enet.c b/drivers/net/4xx_enet.c index 587605dfd1f..c0200481c62 100644 --- a/drivers/net/4xx_enet.c +++ b/drivers/net/4xx_enet.c @@ -870,7 +870,7 @@ static int ppc_4xx_eth_init (struct eth_device *dev, bd_t * bis) defined(CONFIG_405EX) u32 opbfreq; sys_info_t sysinfo; -#if defined(CONFIG_440GX) || defined(CONFIG_440SPE) || \ +#if defined(CONFIG_440GX) || \ defined(CONFIG_440EPX) || defined(CONFIG_440GRX) || \ defined(CONFIG_460EX) || defined(CONFIG_460GT) || \ defined(CONFIG_405EX) @@ -1119,7 +1119,6 @@ static int ppc_4xx_eth_init (struct eth_device *dev, bd_t * bis) #if defined(CONFIG_440GX) || \ defined(CONFIG_440EPX) || defined(CONFIG_440GRX) || \ - defined(CONFIG_440SP) || defined(CONFIG_440SPE) || \ defined(CONFIG_460EX) || defined(CONFIG_460GT) || \ defined(CONFIG_405EX) |