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
/
tqm8272
/
tqm8272.c
diff --git
a/board/tqm8272/tqm8272.c
b/board/tqm8272/tqm8272.c
index
70d1bb8
..
7bd6401
100644
(file)
--- a/
board/tqm8272/tqm8272.c
+++ b/
board/tqm8272/tqm8272.c
@@
-1065,7
+1065,7
@@
int update_flash_size (int flash_size)
}
#endif
-#if
(CONFIG_COMMANDS & CF
G_CMD_NAND)
+#if
defined(CONFI
G_CMD_NAND)
#include <nand.h>
#include <linux/mtd/mtd.h>
@@
-1212,7
+1212,7
@@
int board_nand_init(struct nand_chip *nand)
return 0;
}
-#endif
/* CFG_CMD_NAND */
+#endif
#ifdef CONFIG_PCI
struct pci_controller hose;