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 'buildman' of git://git.denx.de/u-boot-x86
[platform/kernel/u-boot.git]
/
include
/
configs
/
edminiv2.h
diff --git
a/include/configs/edminiv2.h
b/include/configs/edminiv2.h
index
1df4fc1
..
70a698a
100644
(file)
--- a/
include/configs/edminiv2.h
+++ b/
include/configs/edminiv2.h
@@
-23,7
+23,6
@@
*/
#define CONFIG_MARVELL 1
-#define CONFIG_ARM926EJS 1 /* Basic Architecture */
#define CONFIG_FEROCEON 1 /* CPU Core subversion */
#define CONFIG_88F5182 1 /* SOC Name */
#define CONFIG_MACH_EDMINIV2 1 /* Machine type */