diff options
| author | Haavard Skinnemoen <hskinnemoen@atmel.com> | 2007-08-13 16:34:33 +0200 |
|---|---|---|
| committer | Haavard Skinnemoen <hskinnemoen@atmel.com> | 2007-08-13 16:34:33 +0200 |
| commit | 375c2c9e57ea5b8d678475379378f4774aa9cb88 (patch) | |
| tree | c8499eaec089c8fe7c9eda562131f45b4a7738c6 /board/omap2420h4 | |
| parent | f0d1246ed7cb5a88522244c596d7ae7e6f161283 (diff) | |
| parent | 9986bc3e40e899bea372a99a2bca4071bdf2e24b (diff) | |
| download | u-boot-imx-375c2c9e57ea5b8d678475379378f4774aa9cb88.zip u-boot-imx-375c2c9e57ea5b8d678475379378f4774aa9cb88.tar.gz u-boot-imx-375c2c9e57ea5b8d678475379378f4774aa9cb88.tar.bz2 | |
Merge commit 'upstream/master'
Diffstat (limited to 'board/omap2420h4')
| -rw-r--r-- | board/omap2420h4/omap2420h4.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/board/omap2420h4/omap2420h4.c b/board/omap2420h4/omap2420h4.c index f7f75e0..1b917b3 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[]; |