commit f33f94ac2a8cd4c2b06ae95b0f3fc6cb17e4878c
author Guennadi Liakhovetski <lg@denx.de> Wed Jan 09 01:15:25 2008 +0100
committer Wolfgang Denk <wd@denx.de> Wed Jan 09 22:27:09 2008 +0100
tree 4385ab736a14e635729160fc311e24b341b8a587
parent 37cc4f0af81b5825ead93fbd0318da3b028e8cfe

trivial: fix consequences of a bad merge

Fix what looks like a merge artifact.

Signed-off-by: Guennadi Liakhovetski <lg@denx.de>

include/configs/M54455EVB.h

diff --git a/include/configs/M54455EVB.h b/include/configs/M54455EVB.h
index 35637f9..211f11d 100644
--- 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