Module Name: src
Committed By: snj
Date: Wed Oct 21 21:57:40 UTC 2009
Modified Files:
src/sys/arch/arm/footbridge/isa: isapnp_machdep.c
src/sys/arch/atari/dev: grfabs_fal.h
src/sys/arch/atari/isa: isapnp_machdep.c
src/sys/arch/atari/stand/msconfig: msconfig.c
src/sys/arch/powerpc/isa: isapnp_machdep.c
Log Message:
Drop 3rd and 4th clauses. Approved by thomas@ (copyright holder).
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/footbridge/isa/isapnp_machdep.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/atari/dev/grfabs_fal.h
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/atari/isa/isapnp_machdep.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/atari/stand/msconfig/msconfig.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/powerpc/isa/isapnp_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/footbridge/isa/isapnp_machdep.c
diff -u src/sys/arch/arm/footbridge/isa/isapnp_machdep.c:1.4 src/sys/arch/arm/footbridge/isa/isapnp_machdep.c:1.5
--- src/sys/arch/arm/footbridge/isa/isapnp_machdep.c:1.4 Sat Mar 14 15:36:02 2009
+++ src/sys/arch/arm/footbridge/isa/isapnp_machdep.c Wed Oct 21 21:57:39 2009
@@ -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>
Index: src/sys/arch/atari/dev/grfabs_fal.h
diff -u src/sys/arch/atari/dev/grfabs_fal.h:1.4 src/sys/arch/atari/dev/grfabs_fal.h:1.5
--- src/sys/arch/atari/dev/grfabs_fal.h:1.4 Sat Mar 14 14:45:56 2009
+++ src/sys/arch/atari/dev/grfabs_fal.h Wed Oct 21 21:57:39 2009
@@ -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
Index: src/sys/arch/atari/isa/isapnp_machdep.c
diff -u src/sys/arch/atari/isa/isapnp_machdep.c:1.8 src/sys/arch/atari/isa/isapnp_machdep.c:1.9
--- src/sys/arch/atari/isa/isapnp_machdep.c:1.8 Sat Mar 14 15:36:03 2009
+++ src/sys/arch/atari/isa/isapnp_machdep.c Wed Oct 21 21:57:39 2009
@@ -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>
Index: src/sys/arch/atari/stand/msconfig/msconfig.c
diff -u src/sys/arch/atari/stand/msconfig/msconfig.c:1.5 src/sys/arch/atari/stand/msconfig/msconfig.c:1.6
--- src/sys/arch/atari/stand/msconfig/msconfig.c:1.5 Sun Dec 11 12:17:00 2005
+++ src/sys/arch/atari/stand/msconfig/msconfig.c Wed Oct 21 21:57:39 2009
@@ -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
Index: src/sys/arch/powerpc/isa/isapnp_machdep.c
diff -u src/sys/arch/powerpc/isa/isapnp_machdep.c:1.3 src/sys/arch/powerpc/isa/isapnp_machdep.c:1.4
--- src/sys/arch/powerpc/isa/isapnp_machdep.c:1.3 Mon Apr 28 20:23:32 2008
+++ src/sys/arch/powerpc/isa/isapnp_machdep.c Wed Oct 21 21:57:40 2009
@@ -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>
