projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge with git://www.denx.de/git/u-boot.git
[platform/kernel/u-boot.git]
/
board
/
sbc2410x
/
sbc2410x.c
diff --git
a/board/sbc2410x/sbc2410x.c
b/board/sbc2410x/sbc2410x.c
index
7030985
..
b4865e1
100644
(file)
--- a/
board/sbc2410x/sbc2410x.c
+++ b/
board/sbc2410x/sbc2410x.c
@@
-31,7
+31,7
@@
#include <common.h>
#include <s3c2410.h>
#include <common.h>
#include <s3c2410.h>
-#if
(CONFIG_COMMANDS & CF
G_CMD_NAND)
+#if
defined(CONFI
G_CMD_NAND)
#include <linux/mtd/nand.h>
#endif
#include <linux/mtd/nand.h>
#endif
@@
-136,7
+136,7
@@
int dram_init (void)
return 0;
}
return 0;
}
-#if
(CONFIG_COMMANDS & CF
G_CMD_NAND)
+#if
defined(CONFI
G_CMD_NAND)
extern ulong nand_probe(ulong physadr);
static inline void NF_Reset(void)
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
printf ("%4lu MB\n", nand_probe((ulong)nand) >> 20);
}
-#endif
/* CONFIG_COMMANDS & CFG_CMD_NAND */
+#endif