summaryrefslogtreecommitdiffstats
path: root/drivers/nand/diskonchip.c
diff options
context:
space:
mode:
authorMarian Balakowicz <m8@semihalf.com>2006-04-08 19:08:06 +0200
committerMarian Balakowicz <m8@semihalf.com>2006-04-08 19:08:06 +0200
commit6db39708117d6391a72f3fc3ea7860231b630270 (patch)
tree1c69fc84c3f615fe60217096c2947744c72e3528 /drivers/nand/diskonchip.c
parent2fc000d756920b340945a74ec1214a34d9e84858 (diff)
downloadblackbird-obmc-uboot-6db39708117d6391a72f3fc3ea7860231b630270.tar.gz
blackbird-obmc-uboot-6db39708117d6391a72f3fc3ea7860231b630270.zip
Fix JFFS2 support for legacy NAND driver.
Some more NAND cleanup and small fixes.
Diffstat (limited to 'drivers/nand/diskonchip.c')
-rw-r--r--drivers/nand/diskonchip.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/nand/diskonchip.c b/drivers/nand/diskonchip.c
index afaae834f1..e17af70d07 100644
--- 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
OpenPOWER on IntegriCloud