diff options
| author | Minkyu Kang <mk7.kang@samsung.com> | 2010-01-19 09:12:48 +0900 |
|---|---|---|
| committer | Minkyu Kang <mk7.kang@samsung.com> | 2010-01-19 09:12:48 +0900 |
| commit | b097d552bc9ee0351bb0c3d1219856e845df59f9 (patch) | |
| tree | 3b2b8391ec989d9a8b561ce8234dde3b1d481880 /include/jffs2/jffs2.h | |
| parent | e598dfc22c8789991d165714bec53b2390fc999d (diff) | |
| parent | a7709d926dbc7cb1541034fcf2b21ce3e838cb12 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'include/jffs2/jffs2.h')
| -rw-r--r-- | include/jffs2/jffs2.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/include/jffs2/jffs2.h b/include/jffs2/jffs2.h index ed96babf610..651f94cf381 100644 --- a/include/jffs2/jffs2.h +++ b/include/jffs2/jffs2.h @@ -68,10 +68,9 @@ #define JFFS2_COMPR_COPY 0x04 #define JFFS2_COMPR_DYNRUBIN 0x05 #define JFFS2_COMPR_ZLIB 0x06 -#if defined(CONFIG_JFFS2_LZO_LZARI) +#if defined(CONFIG_JFFS2_LZO) #define JFFS2_COMPR_LZO 0x07 -#define JFFS2_COMPR_LZARI 0x08 -#define JFFS2_NUM_COMPR 9 +#define JFFS2_NUM_COMPR 8 #else #define JFFS2_NUM_COMPR 7 #endif @@ -226,11 +225,9 @@ void dynrubin_decompress(unsigned char *data_in, unsigned char *cpage_out, unsigned long sourcelen, unsigned long dstlen); long zlib_decompress(unsigned char *data_in, unsigned char *cpage_out, __u32 srclen, __u32 destlen); -#if defined(CONFIG_JFFS2_LZO_LZARI) +#if defined(CONFIG_JFFS2_LZO) int lzo_decompress(unsigned char *data_in, unsigned char *cpage_out, u32 srclen, u32 destlen); -int lzari_decompress(unsigned char *data_in, unsigned char *cpage_out, - u32 srclen, u32 destlen); #endif char *mkmodestr(unsigned long mode, char *str); |