[U-Boot-Users] [PATCH] trivial: fix consequences of a bad merge
9 Jan
2008
9 Jan
'08
1:15 a.m.
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 db30958..a9b710c 100644 --- a/include/configs/M54455EVB.h +++ b/include/configs/M54455EVB.h @@ -292,7 +292,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
9 Jan
9 Jan
10:27 p.m.
In message Pine.LNX.4.64.0801090109150.10908@axis700.grange you wrote:
Fix what looks like a merge artifact.
Signed-off-by: Guennadi Liakhovetski lg@denx.de
Applied, thanks.
Best regards,
Wolfgang Denk
--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd@denx.de
It is common sense to take a method and try it. If it fails, admit it
frankly and try another. But above all, try something.
- Franklin D. Roosevelt
6331
Age (days ago)
6331
Last active (days ago)
1 comments
2 participants
participants (2)
-
Guennadi Liakhovetski -
Wolfgang Denk