summaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-2.6.36/008-jffs2_make_lzma_available.patch
diff options
context:
space:
mode:
authorAlexandros C. Couloumbis <alex@ozo.com>2010-10-05 08:50:54 +0000
committerAlexandros C. Couloumbis <alex@ozo.com>2010-10-05 08:50:54 +0000
commit11c45f64fe699fc2dd97fa1a0015f28a7ba4f4da (patch)
treecdfe45082cf11d9c3d0d51f1315c08b833b4813f /target/linux/generic/patches-2.6.36/008-jffs2_make_lzma_available.patch
parent978ecae6855efdd2806c2975b85b22c9b2833862 (diff)
downloadmaster-31e0f0ae-11c45f64fe699fc2dd97fa1a0015f28a7ba4f4da.tar.gz
master-31e0f0ae-11c45f64fe699fc2dd97fa1a0015f28a7ba4f4da.tar.bz2
master-31e0f0ae-11c45f64fe699fc2dd97fa1a0015f28a7ba4f4da.zip
linux/generic: refresh 2.6.36 kernel patches
SVN-Revision: 23237
Diffstat (limited to 'target/linux/generic/patches-2.6.36/008-jffs2_make_lzma_available.patch')
-rw-r--r--target/linux/generic/patches-2.6.36/008-jffs2_make_lzma_available.patch12
1 files changed, 6 insertions, 6 deletions
diff --git a/target/linux/generic/patches-2.6.36/008-jffs2_make_lzma_available.patch b/target/linux/generic/patches-2.6.36/008-jffs2_make_lzma_available.patch
index 4b0e4c53d7..e6a30ea1ab 100644
--- a/target/linux/generic/patches-2.6.36/008-jffs2_make_lzma_available.patch
+++ b/target/linux/generic/patches-2.6.36/008-jffs2_make_lzma_available.patch
@@ -28,7 +28,7 @@
+CFLAGS_compr_lzma.o += -Iinclude/linux -Ilib/lzma
--- a/fs/jffs2/compr.c
+++ b/fs/jffs2/compr.c
-@@ -319,6 +319,9 @@ int __init jffs2_compressors_init(void)
+@@ -320,6 +320,9 @@ int __init jffs2_compressors_init(void)
#ifdef CONFIG_JFFS2_LZO
jffs2_lzo_init();
#endif
@@ -38,7 +38,7 @@
/* Setting default compression mode */
#ifdef CONFIG_JFFS2_CMODE_NONE
jffs2_compression_mode = JFFS2_COMPR_MODE_NONE;
-@@ -342,6 +345,9 @@ int __init jffs2_compressors_init(void)
+@@ -343,6 +346,9 @@ int __init jffs2_compressors_init(void)
int jffs2_compressors_exit(void)
{
/* Unregistering compressors */
@@ -50,7 +50,7 @@
#endif
--- a/fs/jffs2/compr.h
+++ b/fs/jffs2/compr.h
-@@ -28,9 +28,9 @@
+@@ -29,9 +29,9 @@
#define JFFS2_DYNRUBIN_PRIORITY 20
#define JFFS2_LZARI_PRIORITY 30
#define JFFS2_RTIME_PRIORITY 50
@@ -63,7 +63,7 @@
#define JFFS2_RUBINMIPS_DISABLED /* RUBINs will be used only */
#define JFFS2_DYNRUBIN_DISABLED /* for decompression */
-@@ -98,5 +98,9 @@ void jffs2_zlib_exit(void);
+@@ -99,5 +99,9 @@ void jffs2_zlib_exit(void);
int jffs2_lzo_init(void);
void jffs2_lzo_exit(void);
#endif
@@ -253,7 +253,7 @@
sizeof(struct jffs2_inode_info),
--- a/include/linux/jffs2.h
+++ b/include/linux/jffs2.h
-@@ -45,6 +45,7 @@
+@@ -46,6 +46,7 @@
#define JFFS2_COMPR_DYNRUBIN 0x05
#define JFFS2_COMPR_ZLIB 0x06
#define JFFS2_COMPR_LZO 0x07
@@ -1049,7 +1049,7 @@
+#endif
--- a/lib/Kconfig
+++ b/lib/Kconfig
-@@ -103,6 +103,12 @@ config LZO_COMPRESS
+@@ -106,6 +106,12 @@ config LZO_COMPRESS
config LZO_DECOMPRESS
tristate