summaryrefslogtreecommitdiff
path: root/include/configs/TQM5200.h
diff options
context:
space:
mode:
authorStefan Roese <sr@denx.de>2005-11-01 10:02:21 +0100
committerStefan Roese <sr@denx.de>2005-11-01 10:02:21 +0100
commitd9f2f5008c32c8373d68a4c8e14f50a469965a23 (patch)
tree64dd39bdb04a7b0d4034d3037e288e7d2341379f /include/configs/TQM5200.h
parente190290ba40fc5340cefd04dd6abf5def15065b9 (diff)
parentbe360d9824d653780ebd3ffc08f1938a8e3dd747 (diff)
downloadu-boot-imx-d9f2f5008c32c8373d68a4c8e14f50a469965a23.zip
u-boot-imx-d9f2f5008c32c8373d68a4c8e14f50a469965a23.tar.gz
u-boot-imx-d9f2f5008c32c8373d68a4c8e14f50a469965a23.tar.bz2
Merge with /git/u-boot.git
Diffstat (limited to 'include/configs/TQM5200.h')
-rw-r--r--include/configs/TQM5200.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/configs/TQM5200.h b/include/configs/TQM5200.h
index a57f7cf..1236ce3 100644
--- a/include/configs/TQM5200.h
+++ b/include/configs/TQM5200.h
@@ -83,7 +83,7 @@
#define CONFIG_PCI_IO_SIZE 0x01000000
#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
#endif /* CONFIG_STK52XX */