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
/
g2000
/
g2000.c
diff --git
a/board/g2000/g2000.c
b/board/g2000/g2000.c
index
3f78753
..
2dfd87c
100644
(file)
--- a/
board/g2000/g2000.c
+++ b/
board/g2000/g2000.c
@@
-73,7
+73,7
@@
int misc_init_f (void)
int misc_init_r (void)
{
int misc_init_r (void)
{
-#if
(CONFIG_COMMANDS & CF
G_CMD_NAND)
+#if
defined(CONFI
G_CMD_NAND)
/*
* Set NAND-FLASH GPIO signals to default
*/
/*
* Set NAND-FLASH GPIO signals to default
*/
@@
-184,8
+184,8
@@
int testdram (void)
}
}
-#if
(CONFIG_COMMANDS & CF
G_CMD_NAND)
-#include <linux/mtd/nand.h>
+#if
defined(CONFI
G_CMD_NAND)
+#include <linux/mtd/nand
_legacy
.h>
extern struct nand_chip nand_dev_desc[CFG_MAX_NAND_DEVICE];
void nand_init(void)
extern struct nand_chip nand_dev_desc[CFG_MAX_NAND_DEVICE];
void nand_init(void)