3 files changed, 12 insertions, 94 deletions
diff --git a/drivers/net/ppp/ppp_deflate.c b/drivers/net/ppp/ppp_deflate.c
index 1dbdf82a6dfd..602c625d95d5 100644
--- a/drivers/net/ppp/ppp_deflate.c
+++ b/drivers/net/ppp/ppp_deflate.c
@@ -1,34 +1,12 @@
 /*
- *  ==FILEVERSION 980319==
- *
 * ppp_deflate.c - interface the zlib procedures for Deflate compression
 * and decompression (as used by gzip) to the PPP code.
- * This version is for use with Linux kernel 1.3.X.
- *
- * Copyright (c) 1994 The Australian National University.
- * All rights reserved.
- *
- * Permission to use, copy, modify, and distribute this software and its
- * documentation is hereby granted, provided that the above copyright
- * notice appears in all copies.  This software is provided without any
- * warranty, express or implied. The Australian National University
- * makes no representations about the suitability of this software for
- * any purpose.
- *
- * IN NO EVENT SHALL THE AUSTRALIAN NATIONAL UNIVERSITY BE LIABLE TO ANY
- * PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
- * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF
- * THE AUSTRALIAN NATIONAL UNIVERSITY HAS BEEN ADVISED OF THE POSSIBILITY
- * OF SUCH DAMAGE.
 *
- * THE AUSTRALIAN NATIONAL UNIVERSITY SPECIFICALLY DISCLAIMS ANY WARRANTIES,
+ * Copyright 1994-1998 Paul Mackerras.
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
- * ON AN "AS IS" BASIS, AND THE AUSTRALIAN NATIONAL UNIVERSITY HAS NO
- * OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS,
- * OR MODIFICATIONS.
 *
- * From: deflate.c,v 1.1 1996/01/18 03:17:48 paulus Exp
+ *  This program is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU General Public License
+ *  version 2 as published by the Free Software Foundation.
 */
 #include <linux/module.h>
diff --git a/include/linux/ppp-comp.h b/include/linux/ppp-comp.h
index b8d4ddd22736..e53ff65935dd 100644
--- a/include/linux/ppp-comp.h
+++ b/include/linux/ppp-comp.h
@@ -1,42 +1,12 @@
 /*
 * ppp-comp.h - Definitions for doing PPP packet compression.
 *
- * Copyright (c) 1994 The Australian National University.
+ * Copyright 1994-1998 Paul Mackerras.
- * All rights reserved.
 *
- * Permission to use, copy, modify, and distribute this software and its
+ *  This program is free software; you can redistribute it and/or
- * documentation is hereby granted, provided that the above copyright
+ *  modify it under the terms of the GNU General Public License
- * notice appears in all copies.  This software is provided without any
+ *  version 2 as published by the Free Software Foundation.
- * warranty, express or implied. The Australian National University
- * makes no representations about the suitability of this software for
- * any purpose.
- *
- * IN NO EVENT SHALL THE AUSTRALIAN NATIONAL UNIVERSITY BE LIABLE TO ANY
- * PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
- * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF
- * THE AUSTRALIAN NATIONAL UNIVERSITY HAVE BEEN ADVISED OF THE POSSIBILITY
- * OF SUCH DAMAGE.
- *
- * THE AUSTRALIAN NATIONAL UNIVERSITY SPECIFICALLY DISCLAIMS ANY WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
- * ON AN "AS IS" BASIS, AND THE AUSTRALIAN NATIONAL UNIVERSITY HAS NO
- * OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS,
- * OR MODIFICATIONS.
 */
-/*
- *  ==FILEVERSION 980319==
- *
- *  NOTE TO MAINTAINERS:
- *     If you modify this file at all, please set the above date.
- *     ppp-comp.h is shipped with a PPP distribution as well as with the kernel;
- *     if everyone increases the FILEVERSION number above, then scripts
- *     can do the right thing when deciding whether to install a new ppp-comp.h
- *     file.  Don't change the format of that line otherwise, so the
- *     installation script can recognize it.
- */
 #ifndef _NET_PPP_COMP_H
 #define _NET_PPP_COMP_H
diff --git a/include/linux/ppp_defs.h b/include/linux/ppp_defs.h
index 0f93ed6b4a88..ba416f67eb62 100644
--- a/include/linux/ppp_defs.h
+++ b/include/linux/ppp_defs.h
@@ -1,44 +1,14 @@
 /*
 * ppp_defs.h - PPP definitions.
 *
- * Copyright (c) 1994 The Australian National University.
+ * Copyright 1994-2000 Paul Mackerras.
- * All rights reserved.
 *
- * Permission to use, copy, modify, and distribute this software and its
+ *  This program is free software; you can redistribute it and/or
- * documentation is hereby granted, provided that the above copyright
+ *  modify it under the terms of the GNU General Public License
- * notice appears in all copies.  This software is provided without any
+ *  version 2 as published by the Free Software Foundation.
- * warranty, express or implied. The Australian National University
- * makes no representations about the suitability of this software for
- * any purpose.
- *
- * IN NO EVENT SHALL THE AUSTRALIAN NATIONAL UNIVERSITY BE LIABLE TO ANY
- * PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
- * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF
- * THE AUSTRALIAN NATIONAL UNIVERSITY HAVE BEEN ADVISED OF THE POSSIBILITY
- * OF SUCH DAMAGE.
- *
- * THE AUSTRALIAN NATIONAL UNIVERSITY SPECIFICALLY DISCLAIMS ANY WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
- * ON AN "AS IS" BASIS, AND THE AUSTRALIAN NATIONAL UNIVERSITY HAS NO
- * OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS,
- * OR MODIFICATIONS.
 */
 #include <linux/types.h>
-/*
- *  ==FILEVERSION 20000114==
- *
- *  NOTE TO MAINTAINERS:
- *     If you modify this file at all, please set the above date.
- *     ppp_defs.h is shipped with a PPP distribution as well as with the kernel;
- *     if everyone increases the FILEVERSION number above, then scripts
- *     can do the right thing when deciding whether to install a new ppp_defs.h
- *     file.  Don't change the format of that line otherwise, so the
- *     installation script can recognize it.
- */
 #ifndef _PPP_DEFS_H_
 #define _PPP_DEFS_H_

diff --git a/drivers/net/ppp/ppp_deflate.c b/drivers/net/ppp/ppp_deflate.c index 1dbdf82a6dfd..602c625d95d5 100644 --- a/drivers/net/ppp/ppp_deflate.c +++ b/drivers/net/ppp/ppp_deflate.c
@@ -1,34 +1,12 @@
1	/*	1	/*
2	* ==FILEVERSION 980319==
3	*
4	* ppp_deflate.c - interface the zlib procedures for Deflate compression	2	* ppp_deflate.c - interface the zlib procedures for Deflate compression
5	* and decompression (as used by gzip) to the PPP code.	3	* and decompression (as used by gzip) to the PPP code.
6	* This version is for use with Linux kernel 1.3.X.
7	*
8	* Copyright (c) 1994 The Australian National University.
9	* All rights reserved.
10	*
11	* Permission to use, copy, modify, and distribute this software and its
12	* documentation is hereby granted, provided that the above copyright
13	* notice appears in all copies. This software is provided without any
14	* warranty, express or implied. The Australian National University
15	* makes no representations about the suitability of this software for
16	* any purpose.
17	*
18	* IN NO EVENT SHALL THE AUSTRALIAN NATIONAL UNIVERSITY BE LIABLE TO ANY
19	* PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
20	* ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF
21	* THE AUSTRALIAN NATIONAL UNIVERSITY HAS BEEN ADVISED OF THE POSSIBILITY
22	* OF SUCH DAMAGE.
23	*	4	*
24	* THE AUSTRALIAN NATIONAL UNIVERSITY SPECIFICALLY DISCLAIMS ANY WARRANTIES,	5	* Copyright 1994-1998 Paul Mackerras.
25	* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
26	* AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS
27	* ON AN "AS IS" BASIS, AND THE AUSTRALIAN NATIONAL UNIVERSITY HAS NO
28	* OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS,
29	* OR MODIFICATIONS.
30	*	6	*
31	* From: deflate.c,v 1.1 1996/01/18 03:17:48 paulus Exp	7	* This program is free software; you can redistribute it and/or
		8	* modify it under the terms of the GNU General Public License
		9	* version 2 as published by the Free Software Foundation.
32	*/	10	*/
33		11
34	#include <linux/module.h>	12	#include <linux/module.h>


diff --git a/include/linux/ppp-comp.h b/include/linux/ppp-comp.h index b8d4ddd22736..e53ff65935dd 100644 --- a/include/linux/ppp-comp.h +++ b/include/linux/ppp-comp.h
@@ -1,42 +1,12 @@
1	/*	1	/*
2	* ppp-comp.h - Definitions for doing PPP packet compression.	2	* ppp-comp.h - Definitions for doing PPP packet compression.
3	*	3	*
4	* Copyright (c) 1994 The Australian National University.	4	* Copyright 1994-1998 Paul Mackerras.
5	* All rights reserved.
6	*	5	*
7	* Permission to use, copy, modify, and distribute this software and its	6	* This program is free software; you can redistribute it and/or
8	* documentation is hereby granted, provided that the above copyright	7	* modify it under the terms of the GNU General Public License
9	* notice appears in all copies. This software is provided without any	8	* version 2 as published by the Free Software Foundation.
10	* warranty, express or implied. The Australian National University
11	* makes no representations about the suitability of this software for
12	* any purpose.
13	*
14	* IN NO EVENT SHALL THE AUSTRALIAN NATIONAL UNIVERSITY BE LIABLE TO ANY
15	* PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
16	* ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF
17	* THE AUSTRALIAN NATIONAL UNIVERSITY HAVE BEEN ADVISED OF THE POSSIBILITY
18	* OF SUCH DAMAGE.
19	*
20	* THE AUSTRALIAN NATIONAL UNIVERSITY SPECIFICALLY DISCLAIMS ANY WARRANTIES,
21	* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
22	* AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS
23	* ON AN "AS IS" BASIS, AND THE AUSTRALIAN NATIONAL UNIVERSITY HAS NO
24	* OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS,
25	* OR MODIFICATIONS.
26	*/	9	*/
27
28	/*
29	* ==FILEVERSION 980319==
30	*
31	* NOTE TO MAINTAINERS:
32	* If you modify this file at all, please set the above date.
33	* ppp-comp.h is shipped with a PPP distribution as well as with the kernel;
34	* if everyone increases the FILEVERSION number above, then scripts
35	* can do the right thing when deciding whether to install a new ppp-comp.h
36	* file. Don't change the format of that line otherwise, so the
37	* installation script can recognize it.
38	*/
39
40	#ifndef _NET_PPP_COMP_H	10	#ifndef _NET_PPP_COMP_H
41	#define _NET_PPP_COMP_H	11	#define _NET_PPP_COMP_H
42		12


diff --git a/include/linux/ppp_defs.h b/include/linux/ppp_defs.h index 0f93ed6b4a88..ba416f67eb62 100644 --- a/include/linux/ppp_defs.h +++ b/include/linux/ppp_defs.h
@@ -1,44 +1,14 @@
1	/*	1	/*
2	* ppp_defs.h - PPP definitions.	2	* ppp_defs.h - PPP definitions.
3	*	3	*
4	* Copyright (c) 1994 The Australian National University.	4	* Copyright 1994-2000 Paul Mackerras.
5	* All rights reserved.
6	*	5	*
7	* Permission to use, copy, modify, and distribute this software and its	6	* This program is free software; you can redistribute it and/or
8	* documentation is hereby granted, provided that the above copyright	7	* modify it under the terms of the GNU General Public License
9	* notice appears in all copies. This software is provided without any	8	* version 2 as published by the Free Software Foundation.
10	* warranty, express or implied. The Australian National University
11	* makes no representations about the suitability of this software for
12	* any purpose.
13	*
14	* IN NO EVENT SHALL THE AUSTRALIAN NATIONAL UNIVERSITY BE LIABLE TO ANY
15	* PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
16	* ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF
17	* THE AUSTRALIAN NATIONAL UNIVERSITY HAVE BEEN ADVISED OF THE POSSIBILITY
18	* OF SUCH DAMAGE.
19	*
20	* THE AUSTRALIAN NATIONAL UNIVERSITY SPECIFICALLY DISCLAIMS ANY WARRANTIES,
21	* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
22	* AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS
23	* ON AN "AS IS" BASIS, AND THE AUSTRALIAN NATIONAL UNIVERSITY HAS NO
24	* OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS,
25	* OR MODIFICATIONS.
26	*/	9	*/
27
28	#include <linux/types.h>	10	#include <linux/types.h>
29		11
30	/*
31	* ==FILEVERSION 20000114==
32	*
33	* NOTE TO MAINTAINERS:
34	* If you modify this file at all, please set the above date.
35	* ppp_defs.h is shipped with a PPP distribution as well as with the kernel;
36	* if everyone increases the FILEVERSION number above, then scripts
37	* can do the right thing when deciding whether to install a new ppp_defs.h
38	* file. Don't change the format of that line otherwise, so the
39	* installation script can recognize it.
40	*/
41
42	#ifndef _PPP_DEFS_H_	12	#ifndef _PPP_DEFS_H_
43	#define _PPP_DEFS_H_	13	#define _PPP_DEFS_H_
44		14