Fix build problems with mp2usb board

[oweals/u-boot.git] / include / jffs2 / jffs2.h

diff --git a/include/jffs2/jffs2.h b/include/jffs2/jffs2.h
index dee43a6d31994c96f2595e5048534f7a2128a3fd..d142cd1bce76de62ae2487fc41811fcbf9716ed3 100644 (file)
--- a/include/jffs2/jffs2.h
+++ b/include/jffs2/jffs2.h
@@ -65,7 +65,13 @@
 #define JFFS2_COMPR_COPY       0x04
 #define JFFS2_COMPR_DYNRUBIN   0x05
 #define JFFS2_COMPR_ZLIB       0x06
+#if defined(CONFIG_JFFS2_LZO_LZARI)
+#define JFFS2_COMPR_LZO                0x07
+#define JFFS2_COMPR_LZARI      0x08
+#define JFFS2_NUM_COMPR                9
+#else
 #define JFFS2_NUM_COMPR                7
+#endif
 
 /* Compatibility flags. */
 #define JFFS2_COMPAT_MASK 0xc000      /* What do to if an unknown nodetype is found */
@@ -193,14 +199,20 @@ u32 jffs2_1pass_ls(struct part_info *part,const char *fname);
 u32 jffs2_1pass_load(char *dest, struct part_info *part,const char *fname);
 u32 jffs2_1pass_info(struct part_info *part);
 
-void rtime_decompress(unsigned char *data_in, unsigned char *cpage_out, u32
-       srclen, u32 destlen);
-void rubin_do_decompress(unsigned char *bits, unsigned char *in, unsigned char
-       *page_out, __u32 destlen);
+void rtime_decompress(unsigned char *data_in, unsigned char *cpage_out,
+               u32 srclen, u32 destlen);
+void rubin_do_decompress(unsigned char *bits, unsigned char *in,
+               unsigned char *page_out, __u32 destlen);
 void dynrubin_decompress(unsigned char *data_in, unsigned char *cpage_out,
-       unsigned long sourcelen, unsigned long dstlen);
+               unsigned long sourcelen, unsigned long dstlen);
 long zlib_decompress(unsigned char *data_in, unsigned char *cpage_out,
-                             __u32 srclen, __u32 destlen);
+               __u32 srclen, __u32 destlen);
+#if defined(CONFIG_JFFS2_LZO_LZARI)
+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);
 #endif /* __LINUX_JFFS2_H__ */