X-Git-Url: http://git.ozo.com/?p=openwrt-10.03%2F.git;a=blobdiff_plain;f=tools%2Fmtd-utils%2Fpatches%2F101-ubifs-optional_lzo.patch;fp=tools%2Fmtd-utils%2Fpatches%2F101-ubifs-optional_lzo.patch;h=d49c94bb2887a7938706e928ba69e2666d23b2cf;hp=35a7cd86f5aeef08d0fb840bafef7610bca41287;hb=d71781fcad5ccc2728ec6b43b291fd191b350530;hpb=120533813050f5b9b01d48aba06df8029a0fd7de

diff --git a/tools/mtd-utils/patches/101-ubifs-optional_lzo.patch b/tools/mtd-utils/patches/101-ubifs-optional_lzo.patch
index 35a7cd86f..d49c94bb2 100644
--- a/tools/mtd-utils/patches/101-ubifs-optional_lzo.patch
+++ b/tools/mtd-utils/patches/101-ubifs-optional_lzo.patch
@@ -15,7 +15,17 @@ diff --git a/mkfs.ubifs/compr.c b/mkfs.ubifs/compr.c
 index e378c5d..0208f80 100644
 --- a/mkfs.ubifs/compr.c
 +++ b/mkfs.ubifs/compr.c
-@@ -83,6 +83,17 @@ static int zlib_deflate(void *in_buf, size_t in_len, void *out_buf,
+@@ -25,7 +25,9 @@
+ #include <stdint.h>
+ #include <string.h>
+ #include <zlib.h>
++#if CONFIG_UBIFS_LZO
+ #include <lzo/lzo1x.h>
++#endif
+ #include <linux/types.h>
+ 
+ #include "compr.h"
+@@ -83,6 +85,17 @@ static int zlib_deflate(void *in_buf, size_t in_len, void *out_buf,
  	return 0;
  }
  
@@ -33,7 +43,7 @@ index e378c5d..0208f80 100644
  static int lzo_compress(void *in_buf, size_t in_len, void *out_buf,
  			size_t *out_len)
  {
-@@ -101,14 +112,16 @@ static int lzo_compress(void *in_buf, size_t in_len, void *out_buf,
+@@ -101,14 +114,16 @@ static int lzo_compress(void *in_buf, size_t in_len, void *out_buf,
  	return 0;
  }
  
@@ -55,7 +65,7 @@ index e378c5d..0208f80 100644
  static char *zlib_buf;
  
  static int favor_lzo_compress(void *in_buf, size_t in_len, void *out_buf,
-@@ -195,9 +208,11 @@ int compress_data(void *in_buf, size_t in_len, void *out_buf, size_t *out_len,
+@@ -195,9 +210,11 @@ int compress_data(void *in_buf, size_t in_len, void *out_buf, size_t *out_len,
  
  int init_compression(void)
  {
@@ -67,7 +77,7 @@ index e378c5d..0208f80 100644
  
  	zlib_buf = malloc(UBIFS_BLOCK_SIZE * WORST_COMPR_FACTOR);
  	if (!zlib_buf) {
-@@ -211,7 +226,9 @@ int init_compression(void)
+@@ -211,7 +228,9 @@ int init_compression(void)
  void destroy_compression(void)
  {
  	free(zlib_buf);