| commit | 6eed2aba01def3f031029e0c68bc3235b4469d3e | [log] [tgz] |
|---|---|---|
| author | Bartlomiej Sieka <tur@semihalf.com> | Fri Feb 24 09:37:22 2006 +0100 |
| committer | Bartlomiej Sieka <tur@pollux.(none)> | Fri Feb 24 09:37:22 2006 +0100 |
| tree | 9925a8bb04e791550c76e864c5821b12fc478e2e | |
| parent | a71cec77a9681f366694b27f3858ec52f72a6b25 [diff] [blame] | |
| parent | 9a08dd1688d8c1fd95de8d41becde6ec3aebbe3b [diff] [blame] |
Merge with /home/wd/git/u-boot/testing-NAND/ to add new NAND handling.
diff --git a/common/cmd_nand.c b/common/cmd_nand.c index b0c01d1..152873f 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>