Fix JFFS2 support for legacy NAND driver.
Some more NAND cleanup and small fixes.
diff --git a/board/delta/config.mk b/board/delta/config.mk
index 9564625..61828bb 100644
--- a/board/delta/config.mk
+++ b/board/delta/config.mk
@@ -3,6 +3,3 @@
#TEXT_BASE = 0xa3080000
#TEXT_BASE = 0x9ffe0000
TEXT_BASE = 0xa3008000
-
-# Compile the new NAND code (needed iff #ifdef CONFIG_NEW_NAND_CODE)
-BOARDLIBS = drivers/nand/libnand.a
diff --git a/board/delta/nand.c b/board/delta/nand.c
index c4df6e5..7982548 100644
--- a/board/delta/nand.c
+++ b/board/delta/nand.c
@@ -23,7 +23,7 @@
#include <common.h>
#if (CONFIG_COMMANDS & CFG_CMD_NAND)
-#ifdef CONFIG_NEW_NAND_CODE
+#if !defined(CFG_NAND_LEGACY)
#include <nand.h>
#include <asm/arch/pxa-regs.h>