From addb2e1650fdf872334478393f482dfdce965a61 Mon Sep 17 00:00:00 2001
From: Bartlomiej Sieka <tur@semihalf.com>
Date: Sun, 5 Mar 2006 18:57:33 +0100
Subject: Re-factoring the legacy NAND code (legacy NAND now only in
 board-specific code and in SoC code). Boards using the old way have
 CFG_NAND_LEGACY and BOARDLIBS = drivers/nand_legacy/libnand_legacy.a added.
 Build breakage for NETTA.ERR and NETTA_ISDN - will go away when the new NAND
 support is implemented for these boards.

---
 drivers/nand/diskonchip.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'drivers/nand/diskonchip.c')

diff --git a/drivers/nand/diskonchip.c b/drivers/nand/diskonchip.c
index 07e2549352..afaae834f1 100644
--- a/drivers/nand/diskonchip.c
+++ b/drivers/nand/diskonchip.c
@@ -20,7 +20,11 @@
  */
 
 #include <common.h>
-#ifdef CONFIG_NEW_NAND_CODE
+
+#ifdef CFG_NAND_LEGACY
+#error CFG_NAND_LEGACY defined in a file not using the legacy NAND support!
+#endif
+
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/sched.h>
@@ -1782,4 +1786,3 @@ module_exit(cleanup_nanddoc);
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("David Woodhouse <dwmw2@infradead.org>");
 MODULE_DESCRIPTION("M-Systems DiskOnChip 2000, Millennium and Millennium Plus device driver\n");
-#endif /* CONFIG_NEW_NAND_CODE */
-- 
cgit v1.2.1