1
0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2025-04-21 12:27:27 +03:00

linux/generic: refresh 2.6.36 kernel patches

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23237 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
acoul
2010-10-05 08:50:54 +00:00
parent 768e3f0496
commit b74489d910
56 changed files with 270 additions and 328 deletions

View File

@@ -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