projects
/
platform
/
kernel
/
u-boot.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4785a69
)
trivial: fix consequences of a bad merge
author
Guennadi Liakhovetski
<lg@denx.de>
Wed, 9 Jan 2008 00:15:25 +0000
(
01:15
+0100)
committer
Wolfgang Denk
<wd@denx.de>
Wed, 9 Jan 2008 21:27:09 +0000
(22:27 +0100)
Fix what looks like a merge artifact.
Signed-off-by: Guennadi Liakhovetski <lg@denx.de>
include/configs/M54455EVB.h
patch
|
blob
|
history
diff --git
a/include/configs/M54455EVB.h
b/include/configs/M54455EVB.h
index
35637f9
..
211f11d
100644
(file)
--- a/
include/configs/M54455EVB.h
+++ b/
include/configs/M54455EVB.h
@@
-294,7
+294,6
@@
#endif
/* M54455EVB has one non CFI flash, defined CFG_FLASH_CFI will cause the system
-/* M54455EVB has one non CFI flash, defined CFG_FLASH_CFI will cause the system
keep reset. */
#undef CFG_FLASH_CFI
#ifdef CFG_FLASH_CFI