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 'u-boot-arm/next' into 'u-boot-arm/master'
[platform/kernel/u-boot.git]
/
include
/
configs
/
MERGERBOX.h
diff --git
a/include/configs/MERGERBOX.h
b/include/configs/MERGERBOX.h
index
8a40029
..
3dcea0b
100644
(file)
--- a/
include/configs/MERGERBOX.h
+++ b/
include/configs/MERGERBOX.h
@@
-16,7
+16,6
@@
* High Level Configuration Options
*/
#define CONFIG_E300 1
-#define CONFIG_MPC83xx 1
#define CONFIG_MPC837x 1
#define CONFIG_MPC8377 1