diff options
| author | Ferenc Havasi <havasi@inf.u-szeged.hu> | 2005-07-26 09:24:43 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@mtd.linutronix.de> | 2005-11-06 11:31:24 -0500 |
| commit | 2227c0ba4bc177a014d95b380b4d888454a127a9 (patch) | |
| tree | 5194c9974261a70473b063fc8c611773c09d719d /fs/jffs2 | |
| parent | f302cd028c90ddbca20cb5388458ae0f0dd03d9b (diff) | |
[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.c | 14 | ||||
| -rw-r--r-- | fs/jffs2/compr.h | 10 |
2 files changed, 2 insertions, 22 deletions
diff --git a/fs/jffs2/compr.c b/fs/jffs2/compr.c index af922a9618..c9e54b97db 100644 --- a/fs/jffs2/compr.c +++ b/fs/jffs2/compr.c | |||
| @@ -9,7 +9,7 @@ | |||
| 9 | * | 9 | * |
| 10 | * For licensing information, see the file 'LICENCE' in this directory. | 10 | * For licensing information, see the file 'LICENCE' in this directory. |
| 11 | * | 11 | * |
| 12 | * $Id: compr.c,v 1.42 2004/08/07 21:56:08 dwmw2 Exp $ | 12 | * $Id: compr.c,v 1.45 2005/07/26 13:24:40 havasi Exp $ |
| 13 | * | 13 | * |
| 14 | */ | 14 | */ |
| 15 | 15 | ||
| @@ -425,12 +425,6 @@ int jffs2_compressors_init(void) | |||
| 425 | jffs2_rubinmips_init(); | 425 | jffs2_rubinmips_init(); |
| 426 | jffs2_dynrubin_init(); | 426 | jffs2_dynrubin_init(); |
| 427 | #endif | 427 | #endif |
| 428 | #ifdef CONFIG_JFFS2_LZARI | ||
| 429 | jffs2_lzari_init(); | ||
| 430 | #endif | ||
| 431 | #ifdef CONFIG_JFFS2_LZO | ||
| 432 | jffs2_lzo_init(); | ||
| 433 | #endif | ||
| 434 | /* Setting default compression mode */ | 428 | /* Setting default compression mode */ |
| 435 | #ifdef CONFIG_JFFS2_CMODE_NONE | 429 | #ifdef CONFIG_JFFS2_CMODE_NONE |
| 436 | jffs2_compression_mode = JFFS2_COMPR_MODE_NONE; | 430 | jffs2_compression_mode = JFFS2_COMPR_MODE_NONE; |
| @@ -449,12 +443,6 @@ int jffs2_compressors_init(void) | |||
| 449 | int jffs2_compressors_exit(void) | 443 | int jffs2_compressors_exit(void) |
| 450 | { | 444 | { |
| 451 | /* Unregistering compressors */ | 445 | /* Unregistering compressors */ |
| 452 | #ifdef CONFIG_JFFS2_LZO | ||
| 453 | jffs2_lzo_exit(); | ||
| 454 | #endif | ||
| 455 | #ifdef CONFIG_JFFS2_LZARI | ||
| 456 | jffs2_lzari_exit(); | ||
| 457 | #endif | ||
| 458 | #ifdef CONFIG_JFFS2_RUBIN | 446 | #ifdef CONFIG_JFFS2_RUBIN |
| 459 | jffs2_dynrubin_exit(); | 447 | jffs2_dynrubin_exit(); |
| 460 | jffs2_rubinmips_exit(); | 448 | jffs2_rubinmips_exit(); |
diff --git a/fs/jffs2/compr.h b/fs/jffs2/compr.h index 89ceeed201..9ec6e37d38 100644 --- a/fs/jffs2/compr.h +++ b/fs/jffs2/compr.h | |||
| @@ -7,7 +7,7 @@ | |||
| 7 | * For licensing information, see the file 'LICENCE' in the | 7 | * For licensing information, see the file 'LICENCE' in the |
| 8 | * jffs2 directory. | 8 | * jffs2 directory. |
| 9 | * | 9 | * |
| 10 | * $Id: compr.h,v 1.6 2004/07/16 15:17:57 dwmw2 Exp $ | 10 | * $Id: compr.h,v 1.8 2005/07/26 13:24:40 havasi Exp $ |
| 11 | * | 11 | * |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| @@ -103,13 +103,5 @@ void jffs2_rtime_exit(void); | |||
| 103 | int jffs2_zlib_init(void); | 103 | int jffs2_zlib_init(void); |
| 104 | void jffs2_zlib_exit(void); | 104 | void jffs2_zlib_exit(void); |
| 105 | #endif | 105 | #endif |
| 106 | #ifdef CONFIG_JFFS2_LZARI | ||
| 107 | int jffs2_lzari_init(void); | ||
| 108 | void jffs2_lzari_exit(void); | ||
| 109 | #endif | ||
| 110 | #ifdef CONFIG_JFFS2_LZO | ||
| 111 | int jffs2_lzo_init(void); | ||
| 112 | void jffs2_lzo_exit(void); | ||
| 113 | #endif | ||
| 114 | 106 | ||
| 115 | #endif /* __JFFS2_COMPR_H__ */ | 107 | #endif /* __JFFS2_COMPR_H__ */ |
