diff options
| author | Michal Simek <monstr@monstr.eu> | 2007-08-07 22:12:05 +0200 |
|---|---|---|
| committer | Michal Simek <monstr@monstr.eu> | 2007-08-07 22:12:05 +0200 |
| commit | 85fad497b3c2e99fa48d18351d2898cf8cdbe898 (patch) | |
| tree | 3c53a3ca56eaba5070a5fbcbbe4718d8ea4d082a /drivers/nand | |
| parent | 706714d97a0d08d59eda4de2268c39f504688329 (diff) | |
| parent | b23b547597ff2375ad13a9ab04e5257a3ad76c99 (diff) | |
| download | u-boot-imx-85fad497b3c2e99fa48d18351d2898cf8cdbe898.zip u-boot-imx-85fad497b3c2e99fa48d18351d2898cf8cdbe898.tar.gz u-boot-imx-85fad497b3c2e99fa48d18351d2898cf8cdbe898.tar.bz2 | |
Merge git://www.denx.de/git/u-boot
Diffstat (limited to 'drivers/nand')
| -rw-r--r-- | drivers/nand/nand.c | 2 | ||||
| -rw-r--r-- | drivers/nand/nand_base.c | 2 | ||||
| -rw-r--r-- | drivers/nand/nand_bbt.c | 2 | ||||
| -rw-r--r-- | drivers/nand/nand_ecc.c | 4 | ||||
| -rw-r--r-- | drivers/nand/nand_ids.c | 2 | ||||
| -rw-r--r-- | drivers/nand/nand_util.c | 4 |
6 files changed, 8 insertions, 8 deletions
diff --git a/drivers/nand/nand.c b/drivers/nand/nand.c index 9fef71d..27b5792 100644 --- a/drivers/nand/nand.c +++ b/drivers/nand/nand.c @@ -23,7 +23,7 @@ #include <common.h> -#if (CONFIG_COMMANDS & CFG_CMD_NAND) && !defined(CFG_NAND_LEGACY) +#if defined(CONFIG_CMD_NAND) && !defined(CFG_NAND_LEGACY) #include <nand.h> diff --git a/drivers/nand/nand_base.c b/drivers/nand/nand_base.c index c6fee18..151f535 100644 --- a/drivers/nand/nand_base.c +++ b/drivers/nand/nand_base.c @@ -72,7 +72,7 @@ #include <common.h> -#if (CONFIG_COMMANDS & CFG_CMD_NAND) && !defined(CFG_NAND_LEGACY) +#if defined(CONFIG_CMD_NAND) && !defined(CFG_NAND_LEGACY) #include <malloc.h> #include <watchdog.h> diff --git a/drivers/nand/nand_bbt.c b/drivers/nand/nand_bbt.c index aaa9400..19a9bc2 100644 --- a/drivers/nand/nand_bbt.c +++ b/drivers/nand/nand_bbt.c @@ -54,7 +54,7 @@ #include <common.h> -#if (CONFIG_COMMANDS & CFG_CMD_NAND) && !defined(CFG_NAND_LEGACY) +#if defined(CONFIG_CMD_NAND) && !defined(CFG_NAND_LEGACY) #include <malloc.h> #include <linux/mtd/compat.h> diff --git a/drivers/nand/nand_ecc.c b/drivers/nand/nand_ecc.c index 90274e6..4c532b0 100644 --- a/drivers/nand/nand_ecc.c +++ b/drivers/nand/nand_ecc.c @@ -37,7 +37,7 @@ #include <common.h> -#if (CONFIG_COMMANDS & CFG_CMD_NAND) && !defined(CFG_NAND_LEGACY) +#if defined(CONFIG_CMD_NAND) && !defined(CFG_NAND_LEGACY) #include<linux/mtd/mtd.h> @@ -197,4 +197,4 @@ int nand_correct_data(struct mtd_info *mtd, u_char *dat, return -1; } -#endif /* CONFIG_COMMANDS & CFG_CMD_NAND */ +#endif diff --git a/drivers/nand/nand_ids.c b/drivers/nand/nand_ids.c index 8b58736..075cae6 100644 --- a/drivers/nand/nand_ids.c +++ b/drivers/nand/nand_ids.c @@ -13,7 +13,7 @@ #include <common.h> -#if (CONFIG_COMMANDS & CFG_CMD_NAND) && !defined(CFG_NAND_LEGACY) +#if defined(CONFIG_CMD_NAND) && !defined(CFG_NAND_LEGACY) #include <linux/mtd/nand.h> diff --git a/drivers/nand/nand_util.c b/drivers/nand/nand_util.c index 10bf036..88c1df6 100644 --- a/drivers/nand/nand_util.c +++ b/drivers/nand/nand_util.c @@ -32,7 +32,7 @@ #include <common.h> -#if (CONFIG_COMMANDS & CFG_CMD_NAND) && !defined(CFG_NAND_LEGACY) +#if defined(CONFIG_CMD_NAND) && !defined(CFG_NAND_LEGACY) #include <command.h> #include <watchdog.h> @@ -859,4 +859,4 @@ int nand_unlock(nand_info_t *meminfo, ulong start, ulong length) return ret; } -#endif /* (CONFIG_COMMANDS & CFG_CMD_NAND) && !defined(CFG_NAND_LEGACY) */ +#endif |