projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.denx.de/u-boot-video
[platform/kernel/u-boot.git]
/
include
/
configs
/
MPC8360ERDK.h
diff --git
a/include/configs/MPC8360ERDK.h
b/include/configs/MPC8360ERDK.h
index
851872a
..
909e8ab
100644
(file)
--- a/
include/configs/MPC8360ERDK.h
+++ b/
include/configs/MPC8360ERDK.h
@@
-290,7
+290,6
@@
#ifdef CONFIG_PCI
-#define CONFIG_NET_MULTI
#define CONFIG_PCI_PNP /* do pci plug-and-play */
#undef CONFIG_EEPRO100
@@
-299,11
+298,6
@@
#endif /* CONFIG_PCI */
-
-#ifndef CONFIG_NET_MULTI
-#define CONFIG_NET_MULTI 1
-#endif
-
/*
* QE UEC ethernet configuration
*/