diff options
| author | Wolfgang Denk <wd@pollux.denx.de> | 2005-10-29 23:45:04 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@pollux.denx.de> | 2005-10-29 23:45:04 +0200 |
| commit | 5d4ee51061e70118fb598e3aca082dd11a154e87 (patch) | |
| tree | b7cddabfe81abe8fa066dd082a9425bee556cd88 /include/configs/PM854.h | |
| parent | 7b5cac0e1958173a390ae6d620a610028cad25f8 (diff) | |
| parent | 99eb35dbbfd94d8d4e047952663f92526ae4dfc8 (diff) | |
| download | u-boot-imx-5d4ee51061e70118fb598e3aca082dd11a154e87.zip u-boot-imx-5d4ee51061e70118fb598e3aca082dd11a154e87.tar.gz u-boot-imx-5d4ee51061e70118fb598e3aca082dd11a154e87.tar.bz2 | |
Merge with /home/m8/git/u-boot
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 |