diff options
| author | Guennadi Liakhovetski <lg@denx.de> | 2008-01-09 01:15:25 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-01-09 22:27:09 +0100 |
| commit | 7ca90513486abd4ae50bd1b7403f47cc58c5ad25 (patch) | |
| tree | 4385ab736a14e635729160fc311e24b341b8a587 | |
| parent | 4785a694c0045996ccf0ac5b8edf531efc1b730e (diff) | |
| download | u-boot-imx-7ca90513486abd4ae50bd1b7403f47cc58c5ad25.zip u-boot-imx-7ca90513486abd4ae50bd1b7403f47cc58c5ad25.tar.gz u-boot-imx-7ca90513486abd4ae50bd1b7403f47cc58c5ad25.tar.bz2 | |
trivial: fix consequences of a bad merge
Fix what looks like a merge artifact.
Signed-off-by: Guennadi Liakhovetski <lg@denx.de>
| -rw-r--r-- | include/configs/M54455EVB.h | 1 |
1 files changed, 0 insertions, 1 deletions
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 |