From: Guennadi Liakhovetski <lg@denx.de>
Date: Wed, 9 Jan 2008 00:15:25 +0000 (+0100)
Subject: trivial: fix consequences of a bad merge
X-Git-Tag: v1.3.2-rc1~102^2~42
X-Git-Url: https://git.kernelconcepts.de/?a=commitdiff_plain;h=7ca90513486abd4ae50bd1b7403f47cc58c5ad25;p=karo-tx-uboot.git

trivial: fix consequences of a bad merge

Fix what looks like a merge artifact.

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

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