summaryrefslogtreecommitdiff
path: root/drivers/nand_legacy
diff options
context:
space:
mode:
authorMichal Simek <monstr@monstr.eu>2007-08-07 22:12:05 +0200
committerMichal Simek <monstr@monstr.eu>2007-08-07 22:12:05 +0200
commit85fad497b3c2e99fa48d18351d2898cf8cdbe898 (patch)
tree3c53a3ca56eaba5070a5fbcbbe4718d8ea4d082a /drivers/nand_legacy
parent706714d97a0d08d59eda4de2268c39f504688329 (diff)
parentb23b547597ff2375ad13a9ab04e5257a3ad76c99 (diff)
downloadu-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_legacy')
-rw-r--r--drivers/nand_legacy/nand_legacy.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/nand_legacy/nand_legacy.c b/drivers/nand_legacy/nand_legacy.c
index 753f541..49d2ebb 100644
--- a/drivers/nand_legacy/nand_legacy.c
+++ b/drivers/nand_legacy/nand_legacy.c
@@ -15,7 +15,7 @@
#include <asm/io.h>
#include <watchdog.h>
-#if (CONFIG_COMMANDS & CFG_CMD_NAND) && defined(CFG_NAND_LEGACY)
+#if defined(CONFIG_CMD_NAND) && defined(CFG_NAND_LEGACY)
#include <linux/mtd/nand_legacy.h>
#include <linux/mtd/nand_ids.h>
@@ -1609,4 +1609,4 @@ int read_jffs2_nand(size_t start, size_t len,
}
#endif /* CONFIG_JFFS2_NAND */
-#endif /* (CONFIG_COMMANDS & CFG_CMD_NAND) && defined(CFG_NAND_LEGACY) */
+#endif