summaryrefslogtreecommitdiff
path: root/target/linux/generic/patches-3.6/510-jffs2_make_lzma_available.patch
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2012-10-24 13:05:22 +0000
committerFlorian Fainelli <florian@openwrt.org>2012-10-24 13:05:22 +0000
commit7e856e5a97966fe89f6336783c0c676eb999e7cf (patch)
treeb5ea6efbf3f80d929729070d75c06b9a4cfe9eea /target/linux/generic/patches-3.6/510-jffs2_make_lzma_available.patch
parent4eda974038a1d09f9a73973566f72ebfd4ce556a (diff)
downloadmtk-20170518-7e856e5a97966fe89f6336783c0c676eb999e7cf.zip
mtk-20170518-7e856e5a97966fe89f6336783c0c676eb999e7cf.tar.gz
mtk-20170518-7e856e5a97966fe89f6336783c0c676eb999e7cf.tar.bz2
make all 3.6 patches apply and build
SVN-Revision: 33911
Diffstat (limited to 'target/linux/generic/patches-3.6/510-jffs2_make_lzma_available.patch')
-rw-r--r--target/linux/generic/patches-3.6/510-jffs2_make_lzma_available.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic/patches-3.6/510-jffs2_make_lzma_available.patch b/target/linux/generic/patches-3.6/510-jffs2_make_lzma_available.patch
index 2d4c3fc..4a0fd0b 100644
--- a/target/linux/generic/patches-3.6/510-jffs2_make_lzma_available.patch
+++ b/target/linux/generic/patches-3.6/510-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
-@@ -374,6 +374,9 @@ int __init jffs2_compressors_init(void)
+@@ -378,6 +378,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;
-@@ -397,6 +400,9 @@ int __init jffs2_compressors_init(void)
+@@ -401,6 +404,9 @@ int __init jffs2_compressors_init(void)
int jffs2_compressors_exit(void)
{
/* Unregistering compressors */
@@ -206,7 +206,7 @@
+}
--- a/fs/jffs2/super.c
+++ b/fs/jffs2/super.c
-@@ -371,14 +371,41 @@ static int __init init_jffs2_fs(void)
+@@ -373,14 +373,41 @@ static int __init init_jffs2_fs(void)
BUILD_BUG_ON(sizeof(struct jffs2_raw_inode) != 68);
BUILD_BUG_ON(sizeof(struct jffs2_raw_summary) != 32);
@@ -1049,7 +1049,7 @@
+#endif
--- a/lib/Kconfig
+++ b/lib/Kconfig
-@@ -118,6 +118,12 @@ config LZO_DECOMPRESS
+@@ -188,6 +188,12 @@ config LZO_DECOMPRESS
source "lib/xz/Kconfig"