summaryrefslogtreecommitdiff
path: root/board/zylonite
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2009-07-19 00:38:23 +0200
committerWolfgang Denk <wd@denx.de>2009-07-19 00:38:23 +0200
commita694610d3361465d4c8d27dde72ab8b63d31115e (patch)
tree063d03bcf75538fe45f940eda5b1e6f1859a96fb /board/zylonite
parent5669ed4557edf2714203aa8625c9fcd5a753b338 (diff)
parent2419169f5749d7af501b3b77a5336d1d535320de (diff)
downloadu-boot-imx-a694610d3361465d4c8d27dde72ab8b63d31115e.zip
u-boot-imx-a694610d3361465d4c8d27dde72ab8b63d31115e.tar.gz
u-boot-imx-a694610d3361465d4c8d27dde72ab8b63d31115e.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-nand-flash
Diffstat (limited to 'board/zylonite')
-rw-r--r--board/zylonite/nand.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/board/zylonite/nand.c b/board/zylonite/nand.c
index 899445e..bec54cb 100644
--- a/board/zylonite/nand.c
+++ b/board/zylonite/nand.c
@@ -23,7 +23,6 @@
#include <common.h>
#if defined(CONFIG_CMD_NAND)
-#ifdef CONFIG_NEW_NAND_CODE
#include <nand.h>
#include <asm/arch/pxa-regs.h>
@@ -554,7 +553,4 @@ int board_nand_init(struct nand_chip *nand)
return 0;
}
-#else
- #error "U-Boot legacy NAND support not available for Monahans DFC."
-#endif
#endif