diff options
| author | Andrew Morton <akpm@osdl.org> | 2004-02-18 04:59:51 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-02-18 04:59:51 -0800 |
| commit | 1295f3375ee01ca30f1ee9ce706310a56138c6f8 (patch) | |
| tree | 06a477a3124d95eefac3760e28eed2bf138bee9f /lib | |
| parent | 7541c77e4d038366d5642701a511ade2ccd1138d (diff) | |
| download | history-1295f3375ee01ca30f1ee9ce706310a56138c6f8.tar.gz | |
[PATCH] crc32.c copyright fix
From: Matt Domsch <Matt_Domsch@dell.com>
Patch below applies to both 2.4.25 and 2.6.3, and replaces the public
domain statement and non-warranty with the GPL, as is permitted by the code
being in the public domain, and is done with legal advice.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/crc32.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/lib/crc32.c b/lib/crc32.c index 5c3292f8da844c..33c33fdd5bf17f 100644 --- a/lib/crc32.c +++ b/lib/crc32.c @@ -1,6 +1,9 @@ -/* +/* * Oct 15, 2000 Matt Domsch <Matt_Domsch@dell.com> * Nicer crc32 functions/docs submitted by linux@horizon.com. Thanks! + * Code was from the public domain, copyright abandoned. Code was + * subsequently included in the kernel, thus was re-licensed under the + * GNU GPL v2. * * Oct 12, 2000 Matt Domsch <Matt_Domsch@dell.com> * Same crc32 function was used in 5 other places in the kernel. @@ -12,7 +15,9 @@ * drivers/net/smc9194.c uses seed ~0, doesn't xor with ~0. * fs/jffs2 uses seed 0, doesn't xor with ~0. * fs/partitions/efi.c uses seed ~0, xor's with ~0. - * + * + * This source code is licensed under the GNU General Public License, + * Version 2. See the file COPYING for more details. */ #include <linux/crc32.h> @@ -38,16 +43,10 @@ #define attribute(x) #endif -/* - * This code is in the public domain; copyright abandoned. - * Liability for non-performance of this code is limited to the amount - * you paid for it. Since it is distributed for free, your refund will - * be very very small. If it breaks, you get to keep both pieces. - */ MODULE_AUTHOR("Matt Domsch <Matt_Domsch@dell.com>"); MODULE_DESCRIPTION("Ethernet CRC32 calculations"); -MODULE_LICENSE("GPL and additional rights"); +MODULE_LICENSE("GPL"); #if CRC_LE_BITS == 1 /* |