diff options
| author | Stefan Roese <sr@denx.de> | 2005-11-01 10:02:21 +0100 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2005-11-01 10:02:21 +0100 |
| commit | d9f2f5008c32c8373d68a4c8e14f50a469965a23 (patch) | |
| tree | 64dd39bdb04a7b0d4034d3037e288e7d2341379f /include/configs/o2dnt.h | |
| parent | e190290ba40fc5340cefd04dd6abf5def15065b9 (diff) | |
| parent | be360d9824d653780ebd3ffc08f1938a8e3dd747 (diff) | |
Merge with /git/u-boot.git
Diffstat (limited to 'include/configs/o2dnt.h')
| -rw-r--r-- | include/configs/o2dnt.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/configs/o2dnt.h b/include/configs/o2dnt.h index 62b90e85fd..04d7d8a282 100644 --- a/include/configs/o2dnt.h +++ b/include/configs/o2dnt.h @@ -69,7 +69,7 @@ #define CFG_XLB_PIPELINING 1 #define CONFIG_NET_MULTI 1 -/* #define CONFIG_EEPRO100 XXX - FIXME: conflicts when CONFIG_MII is enabled */ +#define CONFIG_EEPRO100 #define CFG_RX_ETH_BUFFER 8 /* use 8 rx buffer on eepro100 */ #define CONFIG_NS8382X 1 |