summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2006-06-26 18:21:37 +0200
committerAdrian Bunk <bunk@stusta.de>2006-06-26 18:21:37 +0200
commit0ecbf4b5fc38479ba29149455d56c11a23b131c0 (patch)
treed3431b2704d33f0bf7130e934c0f07c8bc794b47
parentbdca3f202dbeaca2fcc4fb47219476286c999b0d (diff)
downloadop-kernel-dev-0ecbf4b5fc38479ba29149455d56c11a23b131c0.zip
op-kernel-dev-0ecbf4b5fc38479ba29149455d56c11a23b131c0.tar.gz
move acknowledgment for Mark Adler to CREDITS
The place in the documentation of the Linux kernel to acknowledge contributions is the CREDITS file. Give Mark Adler an entry there instead of including a string in the kernel image. Signed-off-by: Adrian Bunk <bunk@stusta.de>
-rw-r--r--CREDITS5
-rw-r--r--lib/zlib_inflate/inftrees.c9
2 files changed, 5 insertions, 9 deletions
diff --git a/CREDITS b/CREDITS
index 1d35f10..85c7c70b7 100644
--- a/CREDITS
+++ b/CREDITS
@@ -24,6 +24,11 @@ S: C. Negri 6, bl. D3
S: Iasi 6600
S: Romania
+N: Mark Adler
+E: madler@alumni.caltech.edu
+W: http://alumnus.caltech.edu/~madler/
+D: zlib decompression
+
N: Monalisa Agrawal
E: magrawal@nortelnetworks.com
D: Basic Interphase 5575 driver with UBR and ABR support.
diff --git a/lib/zlib_inflate/inftrees.c b/lib/zlib_inflate/inftrees.c
index 62343c5..da665fbb 100644
--- a/lib/zlib_inflate/inftrees.c
+++ b/lib/zlib_inflate/inftrees.c
@@ -8,15 +8,6 @@
#define MAXBITS 15
-const char inflate_copyright[] =
- " inflate 1.2.3 Copyright 1995-2005 Mark Adler ";
-/*
- If you use the zlib library in a product, an acknowledgment is welcome
- in the documentation of your product. If for some reason you cannot
- include such an acknowledgment, I would appreciate that you keep this
- copyright string in the executable of your product.
- */
-
/*
Build a set of tables to decode the provided canonical Huffman code.
The code lengths are lens[0..codes-1]. The result starts at *table,
OpenPOWER on IntegriCloud