[src/trunk]: src/sys/arch Drop 3rd and 4th clauses. Approved by thomas@ (cop...

[snj <snj%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/a7801547a2b8
branches:  trunk
changeset: 748357:a7801547a2b8
user:      snj <snj%NetBSD.org@localhost>
date:      Wed Oct 21 21:57:39 2009 +0000

description:
Drop 3rd and 4th clauses.  Approved by thomas@ (copyright holder).

diffstat:

 sys/arch/arm/footbridge/isa/isapnp_machdep.c |  9 ++-------
 sys/arch/atari/dev/grfabs_fal.h              |  7 +------
 sys/arch/atari/isa/isapnp_machdep.c          |  9 ++-------
 sys/arch/atari/stand/msconfig/msconfig.c     |  7 +------
 sys/arch/powerpc/isa/isapnp_machdep.c        |  9 ++-------
 5 files changed, 8 insertions(+), 33 deletions(-)

diffs (132 lines):

diff -r 3dae4c07ac80 -r a7801547a2b8 sys/arch/arm/footbridge/isa/isapnp_machdep.c
--- a/sys/arch/arm/footbridge/isa/isapnp_machdep.c      Wed Oct 21 21:50:14 2009 +0000
+++ b/sys/arch/arm/footbridge/isa/isapnp_machdep.c      Wed Oct 21 21:57:39 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: isapnp_machdep.c,v 1.4 2009/03/14 15:36:02 dsl Exp $   */
+/*     $NetBSD: isapnp_machdep.c,v 1.5 2009/10/21 21:57:39 snj Exp $   */
 
 /*-
  * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -41,11 +41,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by Christos Zoulas.
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -78,7 +73,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isapnp_machdep.c,v 1.4 2009/03/14 15:36:02 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isapnp_machdep.c,v 1.5 2009/10/21 21:57:39 snj Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff -r 3dae4c07ac80 -r a7801547a2b8 sys/arch/atari/dev/grfabs_fal.h
--- a/sys/arch/atari/dev/grfabs_fal.h   Wed Oct 21 21:50:14 2009 +0000
+++ b/sys/arch/atari/dev/grfabs_fal.h   Wed Oct 21 21:57:39 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: grfabs_fal.h,v 1.4 2009/03/14 14:45:56 dsl Exp $       */
+/*     $NetBSD: grfabs_fal.h,v 1.5 2009/10/21 21:57:39 snj Exp $       */
 
 /*
  * Copyright (c) 1995 Thomas Gerner.
@@ -12,11 +12,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by Thomas Gerner
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
diff -r 3dae4c07ac80 -r a7801547a2b8 sys/arch/atari/isa/isapnp_machdep.c
--- a/sys/arch/atari/isa/isapnp_machdep.c       Wed Oct 21 21:50:14 2009 +0000
+++ b/sys/arch/atari/isa/isapnp_machdep.c       Wed Oct 21 21:57:39 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: isapnp_machdep.c,v 1.8 2009/03/14 15:36:03 dsl Exp $   */
+/*     $NetBSD: isapnp_machdep.c,v 1.9 2009/10/21 21:57:39 snj Exp $   */
 
 /*-
  * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -41,11 +41,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by Christos Zoulas.
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -79,7 +74,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isapnp_machdep.c,v 1.8 2009/03/14 15:36:03 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isapnp_machdep.c,v 1.9 2009/10/21 21:57:39 snj Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff -r 3dae4c07ac80 -r a7801547a2b8 sys/arch/atari/stand/msconfig/msconfig.c
--- a/sys/arch/atari/stand/msconfig/msconfig.c  Wed Oct 21 21:50:14 2009 +0000
+++ b/sys/arch/atari/stand/msconfig/msconfig.c  Wed Oct 21 21:57:39 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: msconfig.c,v 1.5 2005/12/11 12:17:00 christos Exp $    */
+/*     $NetBSD: msconfig.c,v 1.6 2009/10/21 21:57:39 snj Exp $ */
 
 /*
  * Copyright (c) 1996 Thomas Gerner.
@@ -12,11 +12,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by Thomas Gerner.
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
diff -r 3dae4c07ac80 -r a7801547a2b8 sys/arch/powerpc/isa/isapnp_machdep.c
--- a/sys/arch/powerpc/isa/isapnp_machdep.c     Wed Oct 21 21:50:14 2009 +0000
+++ b/sys/arch/powerpc/isa/isapnp_machdep.c     Wed Oct 21 21:57:39 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: isapnp_machdep.c,v 1.3 2008/04/28 20:23:32 martin Exp $        */
+/*     $NetBSD: isapnp_machdep.c,v 1.4 2009/10/21 21:57:40 snj Exp $   */
 
 /*-
  * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -41,11 +41,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by Christos Zoulas.
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -78,7 +73,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isapnp_machdep.c,v 1.3 2008/04/28 20:23:32 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isapnp_machdep.c,v 1.4 2009/10/21 21:57:40 snj Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>