diff options
| author | Markus Klotzbücher <mk@pollux.(none)> | 2006-02-24 14:16:31 +0100 |
|---|---|---|
| committer | Markus Klotzbücher <mk@pollux.(none)> | 2006-02-24 14:16:31 +0100 |
| commit | 0377dca227cc883bbaacbe1c442cef5bd6b0e121 (patch) | |
| tree | 6c11795538a28ebd3ddb2389510e91d80c6ef1eb /common/cmd_nand.c | |
| parent | 7d4d1ce48c849ec5a7e034fd4bc4d0e624075e7b (diff) | |
| parent | 038ccac511214b062c56f22b9413f784b86bcd87 (diff) | |
Merge /home/tur/nand/u-boot/
This is a first version of the testing-NAND branch merged back to main.
Diffstat (limited to 'common/cmd_nand.c')
| -rw-r--r-- | common/cmd_nand.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/common/cmd_nand.c b/common/cmd_nand.c index b0c01d1205..152873f1ae 100644 --- a/common/cmd_nand.c +++ b/common/cmd_nand.c @@ -21,7 +21,7 @@ # define SHOW_BOOT_PROGRESS(arg) #endif -#if (CONFIG_COMMANDS & CFG_CMD_NAND) +#if (CONFIG_COMMANDS & CFG_CMD_NAND) && !defined(CONFIG_NEW_NAND_CODE) #include <linux/mtd/nand.h> #include <linux/mtd/nand_ids.h> |