From 7ca90513486abd4ae50bd1b7403f47cc58c5ad25 Mon Sep 17 00:00:00 2001
From: Guennadi Liakhovetski <lg@denx.de>
Date: Wed, 9 Jan 2008 01:15:25 +0100
Subject: [PATCH] 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 | 1 -
 1 file changed, 1 deletion(-)

diff --git a/include/configs/M54455EVB.h b/include/configs/M54455EVB.h
index 35637f92c9..211f11d604 100644
--- a/include/configs/M54455EVB.h
+++ b/include/configs/M54455EVB.h
@@ -293,7 +293,6 @@
 #	define CFG_ENV_SECT_SIZE	0x20000
 #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
-- 
2.39.5