summaryrefslogtreecommitdiff
path: root/fs/jffs2/mini_inflate.c
diff options
context:
space:
mode:
authorHaavard Skinnemoen <hskinnemoen@atmel.com>2007-08-13 16:34:33 +0200
committerHaavard Skinnemoen <hskinnemoen@atmel.com>2007-08-13 16:34:33 +0200
commit375c2c9e57ea5b8d678475379378f4774aa9cb88 (patch)
treec8499eaec089c8fe7c9eda562131f45b4a7738c6 /fs/jffs2/mini_inflate.c
parentf0d1246ed7cb5a88522244c596d7ae7e6f161283 (diff)
parent9986bc3e40e899bea372a99a2bca4071bdf2e24b (diff)
downloadolio-uboot-2014.01-375c2c9e57ea5b8d678475379378f4774aa9cb88.tar.xz
olio-uboot-2014.01-375c2c9e57ea5b8d678475379378f4774aa9cb88.zip
Merge commit 'upstream/master'
Diffstat (limited to 'fs/jffs2/mini_inflate.c')
-rw-r--r--fs/jffs2/mini_inflate.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/jffs2/mini_inflate.c b/fs/jffs2/mini_inflate.c
index 4f511ec1a..4c50fc32d 100644
--- 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)
+#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