diff options
author | Wolfgang Denk <wd@denx.de> | 2007-08-06 01:11:08 +0200 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2007-08-06 01:11:08 +0200 |
commit | f2c2a937d8c4a44f63ff88bf82023e03a29497a2 (patch) | |
tree | fa8f7c9fb65d10259e76c40c52cf8277947424d4 /board/sbc2410x/sbc2410x.c | |
parent | b1b54e352028ed370c3aa95d6fdeb9d64c5d2f86 (diff) | |
parent | 5728be389e65fd47f34b33c2596271eb4db751ae (diff) | |
download | u-boot-imx-f2c2a937d8c4a44f63ff88bf82023e03a29497a2.zip u-boot-imx-f2c2a937d8c4a44f63ff88bf82023e03a29497a2.tar.gz u-boot-imx-f2c2a937d8c4a44f63ff88bf82023e03a29497a2.tar.bz2 |
Merge with /home/wd/git/u-boot/custodian/u-boot-testing
Diffstat (limited to 'board/sbc2410x/sbc2410x.c')
-rw-r--r-- | board/sbc2410x/sbc2410x.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/board/sbc2410x/sbc2410x.c b/board/sbc2410x/sbc2410x.c index 7030985..b4865e1 100644 --- a/board/sbc2410x/sbc2410x.c +++ b/board/sbc2410x/sbc2410x.c @@ -31,7 +31,7 @@ #include <common.h> #include <s3c2410.h> -#if (CONFIG_COMMANDS & CFG_CMD_NAND) +#if defined(CONFIG_CMD_NAND) #include <linux/mtd/nand.h> #endif @@ -136,7 +136,7 @@ int dram_init (void) return 0; } -#if (CONFIG_COMMANDS & CFG_CMD_NAND) +#if defined(CONFIG_CMD_NAND) extern ulong nand_probe(ulong physadr); static inline void NF_Reset(void) @@ -180,4 +180,4 @@ void nand_init(void) #endif printf ("%4lu MB\n", nand_probe((ulong)nand) >> 20); } -#endif /* CONFIG_COMMANDS & CFG_CMD_NAND */ +#endif |