summaryrefslogtreecommitdiffstats
path: root/fs/jffs2
diff options
context:
space:
mode:
authorFerenc Havasi <havasi@inf.u-szeged.hu>2005-07-26 14:24:43 +0100
committerThomas Gleixner <tglx@mtd.linutronix.de>2005-11-06 17:31:24 +0100
commit2227c0ba4bc177a014d95b380b4d888454a127a9 (patch)
tree5194c9974261a70473b063fc8c611773c09d719d /fs/jffs2
parentf302cd028c90ddbca20cb5388458ae0f0dd03d9b (diff)
downloadlinux-2227c0ba4bc177a014d95b380b4d888454a127a9.tar.gz
linux-2227c0ba4bc177a014d95b380b4d888454a127a9.tar.bz2
linux-2227c0ba4bc177a014d95b380b4d888454a127a9.zip
[jffs2] Remove compressor lzo and lzari
Remove unused compressor code Signed-off-by: Ferenc Havasi <havasi@inf.u-szeged.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'fs/jffs2')
-rw-r--r--fs/jffs2/compr.c14
-rw-r--r--fs/jffs2/compr.h10
2 files changed, 2 insertions, 22 deletions
diff --git a/fs/jffs2/compr.c b/fs/jffs2/compr.c
index af922a9618ac..c9e54b97dba8 100644
--- a/fs/jffs2/compr.c
+++ b/fs/jffs2/compr.c
@@ -9,7 +9,7 @@
*
* For licensing information, see the file 'LICENCE' in this directory.
*
- * $Id: compr.c,v 1.42 2004/08/07 21:56:08 dwmw2 Exp $
+ * $Id: compr.c,v 1.45 2005/07/26 13:24:40 havasi Exp $
*
*/
@@ -425,12 +425,6 @@ int jffs2_compressors_init(void)
jffs2_rubinmips_init();
jffs2_dynrubin_init();
#endif
-#ifdef CONFIG_JFFS2_LZARI
- jffs2_lzari_init();
-#endif
-#ifdef CONFIG_JFFS2_LZO
- jffs2_lzo_init();
-#endif
/* Setting default compression mode */
#ifdef CONFIG_JFFS2_CMODE_NONE
jffs2_compression_mode = JFFS2_COMPR_MODE_NONE;
@@ -449,12 +443,6 @@ int jffs2_compressors_init(void)
int jffs2_compressors_exit(void)
{
/* Unregistering compressors */
-#ifdef CONFIG_JFFS2_LZO
- jffs2_lzo_exit();
-#endif
-#ifdef CONFIG_JFFS2_LZARI
- jffs2_lzari_exit();
-#endif
#ifdef CONFIG_JFFS2_RUBIN
jffs2_dynrubin_exit();
jffs2_rubinmips_exit();
diff --git a/fs/jffs2/compr.h b/fs/jffs2/compr.h
index 89ceeed201eb..9ec6e37d3833 100644
--- a/fs/jffs2/compr.h
+++ b/fs/jffs2/compr.h
@@ -7,7 +7,7 @@
* For licensing information, see the file 'LICENCE' in the
* jffs2 directory.
*
- * $Id: compr.h,v 1.6 2004/07/16 15:17:57 dwmw2 Exp $
+ * $Id: compr.h,v 1.8 2005/07/26 13:24:40 havasi Exp $
*
*/
@@ -103,13 +103,5 @@ void jffs2_rtime_exit(void);
int jffs2_zlib_init(void);
void jffs2_zlib_exit(void);
#endif
-#ifdef CONFIG_JFFS2_LZARI
-int jffs2_lzari_init(void);
-void jffs2_lzari_exit(void);
-#endif
-#ifdef CONFIG_JFFS2_LZO
-int jffs2_lzo_init(void);
-void jffs2_lzo_exit(void);
-#endif
#endif /* __JFFS2_COMPR_H__ */