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 branch 'testing' into working
[oweals/u-boot.git]
/
fs
/
jffs2
/
mini_inflate.c
diff --git
a/fs/jffs2/mini_inflate.c
b/fs/jffs2/mini_inflate.c
index 568c2927490d42e28ccb942a53d134b56b47adba..4c50fc32dc20f6c53561c394ad9605c9f32d9914 100644
(file)
--- a/
fs/jffs2/mini_inflate.c
+++ b/
fs/jffs2/mini_inflate.c
@@
-25,7
+25,7
@@
#include <config.h>
-#if
(CONFIG_COMMANDS & CFG_CMD_JFFS2) ||
defined(CONFIG_CMD_JFFS2)
+#if defined(CONFIG_CMD_JFFS2)
#include <jffs2/mini_inflate.h>
@@
-393,4
+393,4
@@
long decompress_block(unsigned char *dest, unsigned char *source,
return stream.error ? -stream.error : stream.decoded;
}
-#endif
/* CFG_CMD_JFFS2 */
+#endif