Merge branch 'merge' of git://www.denx.de/git/u-boot-microblaze

[oweals/u-boot.git] / drivers / nand / diskonchip.c

diff --git a/drivers/nand/diskonchip.c b/drivers/nand/diskonchip.c
index afaae834f1c106297f673ba064178561b2214342..e17af70d07fa1075f21c9e5b61fd31eb27b4a80f 100644 (file)
--- a/drivers/nand/diskonchip.c
+++ b/drivers/nand/diskonchip.c
@@ -21,9 +21,7 @@
 
 #include <common.h>
 
-#ifdef CFG_NAND_LEGACY
-#error CFG_NAND_LEGACY defined in a file not using the legacy NAND support!
-#endif
+#if !defined(CFG_NAND_LEGACY)
 
 #include <linux/kernel.h>
 #include <linux/init.h>
@@ -1786,3 +1784,4 @@ 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