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]
/
fs
/
jffs2
/
jffs2_nand_1pass.c
diff --git
a/fs/jffs2/jffs2_nand_1pass.c
b/fs/jffs2/jffs2_nand_1pass.c
index
e78af75
..
3a4c649
100644
(file)
--- a/
fs/jffs2/jffs2_nand_1pass.c
+++ b/
fs/jffs2/jffs2_nand_1pass.c
@@
-1,6
+1,6
@@
#include <common.h>
-#if !defined(CFG_NAND_LEGACY) &&
(CONFIG_COMMANDS & CF
G_CMD_JFFS2)
+#if !defined(CFG_NAND_LEGACY) &&
defined(CONFI
G_CMD_JFFS2)
#include <malloc.h>
#include <linux/stat.h>
@@
-1033,4
+1033,4
@@
jffs2_1pass_info(struct part_info * part)
return 1;
}
-#endif
/* CFG_CMD_JFFS2 */
+#endif