diff options
author | Wolfgang Denk <wd@atlas.denx.de> | 2006-03-06 23:18:48 +0100 |
---|---|---|
committer | Wolfgang Denk <wd@atlas.denx.de> | 2006-03-06 23:18:48 +0100 |
commit | 951a954b77ef30df1f5c1b7b9b4312e783b2cbb4 (patch) | |
tree | 8f94ab1a2e15fbf31c322e6be1f750e10ac2fe2f /drivers/nand/nand.c | |
parent | ac7d97dcbb499c96c8182757f301dd2e09c9f49d (diff) | |
parent | bfc81252c0de3bfcf92c7c35bc04341fb33e4e4e (diff) | |
download | u-boot-imx-951a954b77ef30df1f5c1b7b9b4312e783b2cbb4.zip u-boot-imx-951a954b77ef30df1f5c1b7b9b4312e783b2cbb4.tar.gz u-boot-imx-951a954b77ef30df1f5c1b7b9b4312e783b2cbb4.tar.bz2 |
Merge with /home/wd/git/u-boot/master
Code cleanup.
Diffstat (limited to 'drivers/nand/nand.c')
-rw-r--r-- | drivers/nand/nand.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/nand/nand.c b/drivers/nand/nand.c index bc85005..dd80026 100644 --- a/drivers/nand/nand.c +++ b/drivers/nand/nand.c @@ -23,7 +23,10 @@ #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 + #if (CONFIG_COMMANDS & CFG_CMD_NAND) #include <nand.h> @@ -72,5 +75,3 @@ void nand_init(void) } #endif -#endif /* CONFIG_NEW_NAND_CODE */ - |