projects
/
oweals
/
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-testing
[oweals/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 e5c2a7dd4129bd1310309c78a9eb74287311c666..b9cdcbfa5654319d9938d576c0da1853196b0dfe 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(CONFIG_NEW_NAND_CODE) && (CONFIG_COMMANDS & CFG_CMD_JFFS2
)
+#if
!defined(CFG_NAND_LEGACY) && ((CONFIG_COMMANDS & CFG_CMD_JFFS2) || defined(CONFIG_CMD_JFFS2)
)
#include <malloc.h>
#include <linux/stat.h>