diff options
author | Stefan Roese <sr@denx.de> | 2005-11-01 09:02:21 (GMT) |
---|---|---|
committer | Stefan Roese <sr@denx.de> | 2005-11-01 09:02:21 (GMT) |
commit | d9f2f5008c32c8373d68a4c8e14f50a469965a23 (patch) | |
tree | 64dd39bdb04a7b0d4034d3037e288e7d2341379f /include/configs/PM854.h | |
parent | e190290ba40fc5340cefd04dd6abf5def15065b9 (diff) | |
parent | be360d9824d653780ebd3ffc08f1938a8e3dd747 (diff) | |
download | u-boot-fsl-qoriq-d9f2f5008c32c8373d68a4c8e14f50a469965a23.tar.xz |
Merge with /git/u-boot.git
Diffstat (limited to 'include/configs/PM854.h')
-rw-r--r-- | include/configs/PM854.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/configs/PM854.h b/include/configs/PM854.h index 0b8c71d..da01186 100644 --- a/include/configs/PM854.h +++ b/include/configs/PM854.h @@ -235,7 +235,7 @@ #define CONFIG_NET_MULTI #define CONFIG_PCI_PNP /* do pci plug-and-play */ -/* #define CONFIG_EEPRO100 XXX - FIXME: conflicts when CONFIG_MII is enabled */ +#define CONFIG_EEPRO100 #define CONFIG_E1000 #undef CONFIG_TULIP |