diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-10-09 00:00:47 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-10-09 00:00:47 +0000 |
| commit | d6434e1042f3b0a6dfe1b1f615af369486f9b1fa (patch) | |
| tree | e2be02f33984c48ec019c654051d27964e42c441 /net/irda/compressors | |
| parent | 609d1e803baf519487233b765eb487f9ec227a18 (diff) | |
Merge with 2.3.19.
Diffstat (limited to 'net/irda/compressors')
| -rw-r--r-- | net/irda/compressors/.cvsignore | 2 | ||||
| -rw-r--r-- | net/irda/compressors/Config.in | 14 | ||||
| -rw-r--r-- | net/irda/compressors/irda_deflate.c | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/net/irda/compressors/.cvsignore b/net/irda/compressors/.cvsignore deleted file mode 100644 index 857dd22e9..000000000 --- a/net/irda/compressors/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -.depend -.*.flags diff --git a/net/irda/compressors/Config.in b/net/irda/compressors/Config.in index 61500751b..1a4306dea 100644 --- a/net/irda/compressors/Config.in +++ b/net/irda/compressors/Config.in @@ -1,9 +1,11 @@ -bool 'IrLAP compression' CONFIG_IRDA_COMPRESSION +bool ' IrLAP compression' CONFIG_IRDA_COMPRESSION -if [ "$CONFIG_IRDA_COMPRESSION" != "n" ] ; then - comment ' IrDA compressors' - dep_tristate ' Deflate compression (experimental)' CONFIG_IRDA_DEFLATE $CONFIG_IRDA -# tristate ' BZIP2 compression' CONFIG_IRDA_BZIP2 -# tristate ' BSD compression' CONFIG_IRDA_BSD +if [ "$CONFIG_IRDA_COMPRESSION" != "n" ]; then + comment ' IrDA compressors' + if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then + dep_tristate ' Deflate compression (EXPERIMENTAL)' CONFIG_IRDA_DEFLATE $CONFIG_IRDA + fi +# tristate ' BZIP2 compression' CONFIG_IRDA_BZIP2 +# tristate ' BSD compression' CONFIG_IRDA_BSD fi diff --git a/net/irda/compressors/irda_deflate.c b/net/irda/compressors/irda_deflate.c index bfb921277..245185500 100644 --- a/net/irda/compressors/irda_deflate.c +++ b/net/irda/compressors/irda_deflate.c @@ -594,7 +594,7 @@ static struct compressor irda_deflate_draft = { z_comp_stats, /* decomp_stat */ }; -__initfunc(int irda_deflate_init(void)) +int __init irda_deflate_init(void) { int answer = irda_register_compressor ( &irda_deflate); if (answer == 0) |