diff options
| author | Wolfgang Denk <wd@pollux.denx.de> | 2006-04-12 12:26:32 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@pollux.denx.de> | 2006-04-12 12:26:32 +0200 |
| commit | b28a31ca0290627c531b9df0d48ec0239078d2d4 (patch) | |
| tree | 780f563c9083e773f08b4ca3423b8af0c6994aba /drivers/nand/diskonchip.c | |
| parent | 3a5e21881a194f4d4e053be8410d82a2458e8544 (diff) | |
| parent | 6db39708117d6391a72f3fc3ea7860231b630270 (diff) | |
| download | u-boot-imx-b28a31ca0290627c531b9df0d48ec0239078d2d4.zip u-boot-imx-b28a31ca0290627c531b9df0d48ec0239078d2d4.tar.gz u-boot-imx-b28a31ca0290627c531b9df0d48ec0239078d2d4.tar.bz2 | |
Merge with /home/m8/git/u-boot
Diffstat (limited to 'drivers/nand/diskonchip.c')
| -rw-r--r-- | drivers/nand/diskonchip.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/nand/diskonchip.c b/drivers/nand/diskonchip.c index afaae83..e17af70 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 |