projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'mpc86xx'
[oweals/u-boot.git]
/
include
/
configs
/
PM854.h
diff --git
a/include/configs/PM854.h
b/include/configs/PM854.h
index 0b8c71d852bd70063d1a6c8d04c8d41bb4bcec8d..da011867717078cd02d61359576724ab3da3f613 100644
(file)
--- 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