summaryrefslogtreecommitdiff
path: root/include/configs/PM854.h
diff options
context:
space:
mode:
authorWolfgang Denk <wd@pollux.denx.de>2005-10-13 01:45:54 +0200
committerWolfgang Denk <wd@pollux.denx.de>2005-10-13 01:45:54 +0200
commitf57f70aab9d5ed7964f2f791829a2d780b788a7e (patch)
treea618aa9c21d7e9ee9cb79161f0085edaa5f22672 /include/configs/PM854.h
parent3df5bea0b0bddc196bf952c51d1dd54d966b82ba (diff)
downloadu-boot-imx-f57f70aab9d5ed7964f2f791829a2d780b788a7e.zip
u-boot-imx-f57f70aab9d5ed7964f2f791829a2d780b788a7e.tar.gz
u-boot-imx-f57f70aab9d5ed7964f2f791829a2d780b788a7e.tar.bz2
Support passing of OF flat trees to the kernel.
Patch by Pantelis Antoniou, 04 Sep 2005
Diffstat (limited to 'include/configs/PM854.h')
-rw-r--r--include/configs/PM854.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/configs/PM854.h b/include/configs/PM854.h
index af06efc..0b8c71d 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
+/* #define CONFIG_EEPRO100 XXX - FIXME: conflicts when CONFIG_MII is enabled */
#define CONFIG_E1000
#undef CONFIG_TULIP