two many zlib's in the kernel

[David Fries <dfries@mail.win.org>]

[-- Attachment #1: Type: text/plain, Size: 1170 bytes --]

Seems someone duplicated the zlib.  One copy is in ppp the other is in
jffs2 as I listed below they are virtually identical.  The problem is
you can't compile both in the kernel at the same time for obvious
reasons.  Since I don't know the build code maybe someone else would
like to fix it?

./fs/jffs2/zlib.c
./drivers/net/zlib.c

diff ./fs/jffs2/zlib.c ./drivers/net/zlib.c
436c436
<     /* Didn't use ct_data typedef below to supress compiler warning */
---
>     /* Didn't use ct_data typedef below to suppress compiler warning */
692c692
<  * IN  assertion: all calls to to UPDATE_HASH are made with consecutive
---
>  * IN  assertion: all calls to UPDATE_HASH are made with consecutive
703c703
<  * IN  assertion: all calls to to INSERT_STRING are made with consecutive
---
>  * IN  assertion: all calls to INSERT_STRING are made with consecutive
2068c2068
<     static int static_init_done = 0;
---
>     static int static_init_done;

-- 
		+---------------------------------+
		|      David Fries                |
		|      dfries@mail.win.org        |
		| http://fries.net/~david/pgp.txt |
		+---------------------------------+

[-- Attachment #2: Type: application/pgp-signature, Size: 240 bytes --]