diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-08-13 21:23:13 (GMT) |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-08-13 21:23:13 (GMT) |
| commit | 2fd0aad443c966ce62008225e57b18e2dcf4e330 (patch) | |
| tree | a9166e535df4d867ce73eca3fd97ebc500ecf771 /cpu | |
| parent | 5a7ddf4e1fb9347f783eb1473c30187d7a22bd81 (diff) | |
| parent | 9483df6408c25f16060432de3868901e352e23bc (diff) | |
| download | u-boot-2fd0aad443c966ce62008225e57b18e2dcf4e330.tar.xz | |
Merge branch 'Makefile' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'cpu')
| -rw-r--r-- | cpu/arm920t/s3c24x0/nand.c | 2 | ||||
| -rw-r--r-- | cpu/arm926ejs/davinci/nand.c | 2 | ||||
| -rw-r--r-- | cpu/ppc4xx/ndfc.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/cpu/arm920t/s3c24x0/nand.c b/cpu/arm920t/s3c24x0/nand.c index e1bf128..14882cb 100644 --- a/cpu/arm920t/s3c24x0/nand.c +++ b/cpu/arm920t/s3c24x0/nand.c @@ -27,7 +27,7 @@ #endif #if defined(CONFIG_CMD_NAND) -#if !defined(CFG_NAND_LEGACY) +#if !defined(CONFIG_NAND_LEGACY) #include <nand.h> #include <s3c2410.h> diff --git a/cpu/arm926ejs/davinci/nand.c b/cpu/arm926ejs/davinci/nand.c index 8fd784e..2aa01d6 100644 --- a/cpu/arm926ejs/davinci/nand.c +++ b/cpu/arm926ejs/davinci/nand.c @@ -45,7 +45,7 @@ #include <asm/io.h> #ifdef CFG_USE_NAND -#if !defined(CFG_NAND_LEGACY) +#if !defined(CONFIG_NAND_LEGACY) #include <nand.h> #include <asm/arch/nand_defs.h> diff --git a/cpu/ppc4xx/ndfc.c b/cpu/ppc4xx/ndfc.c index 4f083d9..72acfd0 100644 --- a/cpu/ppc4xx/ndfc.c +++ b/cpu/ppc4xx/ndfc.c @@ -31,7 +31,7 @@ #include <common.h> -#if defined(CONFIG_CMD_NAND) && !defined(CFG_NAND_LEGACY) && \ +#if defined(CONFIG_CMD_NAND) && !defined(CONFIG_NAND_LEGACY) && \ (defined(CONFIG_440EP) || defined(CONFIG_440GR) || \ defined(CONFIG_440EPX) || defined(CONFIG_440GRX) || \ defined(CONFIG_405EZ) || defined(CONFIG_405EX) || \ |