summaryrefslogtreecommitdiff
path: root/board/omap2420h4
diff options
context:
space:
mode:
authorStefan Roese <sr@denx.de>2007-08-14 18:36:29 +0400
committerStefan Roese <sr@denx.de>2007-08-14 18:36:29 +0400
commit3b3bff4cbf2cb14f9a3e7d03f26ebab900efe4ae (patch)
treefb66bf8861d9f78765160d734a438856f5317cdb /board/omap2420h4
parent4ce846ec59f36b85d6644a769690ad3feb667575 (diff)
parent4ef35e53c693556c54b0c22d6f873de87bade253 (diff)
downloadu-boot-3b3bff4cbf2cb14f9a3e7d03f26ebab900efe4ae.tar.xz
Merge with git://www.denx.de/git/u-boot.git
Diffstat (limited to 'board/omap2420h4')
-rw-r--r--board/omap2420h4/omap2420h4.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/board/omap2420h4/omap2420h4.c b/board/omap2420h4/omap2420h4.c
index f7f75e0fe1..1b917b3147 100644
--- a/board/omap2420h4/omap2420h4.c
+++ b/board/omap2420h4/omap2420h4.c
@@ -31,7 +31,7 @@
#include <asm/arch/mem.h>
#include <i2c.h>
#include <asm/mach-types.h>
-#if (CONFIG_COMMANDS & CFG_CMD_NAND)
+#if defined(CONFIG_CMD_NAND)
#include <linux/mtd/nand_legacy.h>
extern struct nand_chip nand_dev_desc[CFG_MAX_NAND_DEVICE];
#endif
@@ -847,7 +847,7 @@ void update_mux(u32 btype,u32 mtype)
}
}
-#if (CONFIG_COMMANDS & CFG_CMD_NAND)
+#if defined(CONFIG_CMD_NAND)
void nand_init(void)
{
extern flash_info_t flash_info[];