mtd/util Makefile,1.56,1.57 compr.c,1.7,1.8 compr.h,1.5,1.6

[havasi at infradead.org]

Update of /home/cvs/mtd/util
In directory phoenix.infradead.org:/tmp/cvs-serv18612

Modified Files:
	Makefile compr.c compr.h 
Log Message:
Removing compressors lzo and lzari.



Index: Makefile
===================================================================
RCS file: /home/cvs/mtd/util/Makefile,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- Makefile	19 Jun 2005 16:43:02 -0000	1.56
+++ Makefile	26 Jul 2005 13:07:02 -0000	1.57
@@ -40,7 +40,7 @@
 $(SYMLINKS):
 	ln -sf ../fs/jffs2/$@ $@
 
-mkfs.jffs2: crc32.o compr_rtime.o mkfs.jffs2.o compr_zlib.o compr.o compr_lzari.o compr_lzo.o
+mkfs.jffs2: crc32.o compr_rtime.o mkfs.jffs2.o compr_zlib.o compr.o
 	$(CC) $(LDFLAGS) -o $@ $^ -lz
 
 flash_eraseall: crc32.o flash_eraseall.o

Index: compr.c
===================================================================
RCS file: /home/cvs/mtd/util/compr.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- compr.c	17 Feb 2005 14:55:06 -0000	1.7
+++ compr.c	26 Jul 2005 13:07:02 -0000	1.8
@@ -474,23 +474,11 @@
 #ifdef CONFIG_JFFS2_RTIME
         jffs2_rtime_init();
 #endif
-#ifdef CONFIG_JFFS2_LZARI
-        jffs2_lzari_init();
-#endif
-#ifdef CONFIG_JFFS2_LZO
-        jffs2_lzo_init();
-#endif
         return 0;
 }
 
 int jffs2_compressors_exit(void)
 {
-#ifdef CONFIG_JFFS2_LZO
-        jffs2_lzo_exit();
-#endif
-#ifdef CONFIG_JFFS2_LZARI
-        jffs2_lzari_exit();
-#endif
 #ifdef CONFIG_JFFS2_RTIME
         jffs2_rtime_exit();
 #endif

Index: compr.h
===================================================================
RCS file: /home/cvs/mtd/util/compr.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- compr.h	24 Jun 2004 09:52:57 -0000	1.5
+++ compr.h	26 Jul 2005 13:07:02 -0000	1.6
@@ -21,15 +21,9 @@
 
 #define CONFIG_JFFS2_ZLIB
 #define CONFIG_JFFS2_RTIME
-#define CONFIG_JFFS2_LZARI
-#define CONFIG_JFFS2_LZO
-#define JFFS2_LZARI_DISABLED
-#define JFFS2_LZO_DISABLED
 
 #define JFFS2_RUBINMIPS_PRIORITY 10
 #define JFFS2_DYNRUBIN_PRIORITY  20
-#define JFFS2_LZARI_PRIORITY     30
-#define JFFS2_LZO_PRIORITY       40
 #define JFFS2_RTIME_PRIORITY     50
 #define JFFS2_ZLIB_PRIORITY      60
 
@@ -117,13 +111,5 @@
 int jffs2_rtime_init(void);
 void jffs2_rtime_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__ */