diff options
Diffstat (limited to 'fs/jffs2/jffs2_1pass.c')
| -rw-r--r-- | fs/jffs2/jffs2_1pass.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/fs/jffs2/jffs2_1pass.c b/fs/jffs2/jffs2_1pass.c index a025116b7..c3553cb4a 100644 --- a/fs/jffs2/jffs2_1pass.c +++ b/fs/jffs2/jffs2_1pass.c @@ -275,10 +275,8 @@ static char *compr_names[] = { "COPY", "DYNRUBIN", "ZLIB", -#if defined(CONFIG_JFFS2_LZO) +#if defined(CONFIG_JFFS2_LZO_LZARI) "LZO", -#endif -#if defined(CONFIG_JFFS2_LZARI) "LZARI", #endif }; @@ -589,15 +587,13 @@ jffs2_1pass_read_inode(struct b_lists *pL, u32 inode, char *dest) case JFFS2_COMPR_ZLIB: ret = zlib_decompress(src, lDest, jNode->csize, jNode->dsize); break; -#if defined(CONFIG_JFFS2_LZARI) - case JFFS2_COMPR_LZARI: - ret = lzari_decompress(src, lDest, jNode->csize, jNode->dsize); - break; -#endif -#if defined(CONFIG_JFFS2_LZO) +#if defined(CONFIG_JFFS2_LZO_LZARI) case JFFS2_COMPR_LZO: ret = lzo_decompress(src, lDest, jNode->csize, jNode->dsize); break; + case JFFS2_COMPR_LZARI: + ret = lzari_decompress(src, lDest, jNode->csize, jNode->dsize); + break; #endif default: /* unknown */ |