diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-08-13 23:23:13 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-08-13 23:23:13 +0200 |
| commit | 2fd0aad443c966ce62008225e57b18e2dcf4e330 (patch) | |
| tree | a9166e535df4d867ce73eca3fd97ebc500ecf771 /common/cmd_nand.c | |
| parent | 5a7ddf4e1fb9347f783eb1473c30187d7a22bd81 (diff) | |
| parent | 9483df6408c25f16060432de3868901e352e23bc (diff) | |
| download | talos-obmc-uboot-2fd0aad443c966ce62008225e57b18e2dcf4e330.tar.gz talos-obmc-uboot-2fd0aad443c966ce62008225e57b18e2dcf4e330.zip | |
Merge branch 'Makefile' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'common/cmd_nand.c')
| -rw-r--r-- | common/cmd_nand.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/common/cmd_nand.c b/common/cmd_nand.c index 520c15217c..fa7a438b5f 100644 --- a/common/cmd_nand.c +++ b/common/cmd_nand.c @@ -11,7 +11,7 @@ #include <common.h> -#ifndef CFG_NAND_LEGACY +#ifndef CONFIG_NAND_LEGACY /* * * New NAND support @@ -667,7 +667,7 @@ U_BOOT_CMD(nboot, 4, 1, do_nandboot, #endif -#else /* CFG_NAND_LEGACY */ +#else /* CONFIG_NAND_LEGACY */ /* * * Legacy NAND support - to be phased out @@ -1077,4 +1077,4 @@ U_BOOT_CMD( #endif -#endif /* CFG_NAND_LEGACY */ +#endif /* CONFIG_NAND_LEGACY */ |
