diff options
author | Bartlomiej Sieka <tur@semihalf.com> | 2006-03-05 18:57:33 +0100 |
---|---|---|
committer | Bartlomiej Sieka <tur@semihalf.com> | 2006-03-05 18:57:33 +0100 |
commit | addb2e1650fdf872334478393f482dfdce965a61 (patch) | |
tree | c16d3de22d1e1040d3f8e6ecfaed20bf2f2c5ea6 /drivers/nand/diskonchip.c | |
parent | 038ccac511214b062c56f22b9413f784b86bcd87 (diff) | |
download | u-boot-midas-addb2e1650fdf872334478393f482dfdce965a61.tar.gz u-boot-midas-addb2e1650fdf872334478393f482dfdce965a61.tar.bz2 u-boot-midas-addb2e1650fdf872334478393f482dfdce965a61.zip |
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.
Diffstat (limited to 'drivers/nand/diskonchip.c')
-rw-r--r-- | drivers/nand/diskonchip.c | 7 |
1 files changed, 5 insertions, 2 deletions
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 */ |