Module Name:    src
Committed By:   snj
Date:           Wed Oct 21 23:53:38 UTC 2009

Modified Files:
        src/sys/arch/amiga/dev: bzivsc.c bzivscvar.h bzscvar.h bztzscvar.h
            cbiisc.c cbiiscvar.h cbsc.c cbscvar.h flscvar.h if_es.c if_esreg.h
            siop2_script.ss siop_script.ss
        src/sys/arch/amiga/stand/loadbsd: loadbsd.c
        src/sys/dev/microcode/siop: ncr53cxxx.c osiop.ss

Log Message:
Drop 3rd and 4th clauses (except on files where copyright is shared
with UC, in which case only the ad clause has been removed). Approved
by mhitch@ (copyright holder).


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/amiga/dev/bzivsc.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/amiga/dev/bzivscvar.h \
    src/sys/arch/amiga/dev/cbiiscvar.h src/sys/arch/amiga/dev/cbscvar.h
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/amiga/dev/bzscvar.h
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/amiga/dev/bztzscvar.h \
    src/sys/arch/amiga/dev/siop_script.ss
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/amiga/dev/cbiisc.c
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/amiga/dev/cbsc.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/amiga/dev/flscvar.h \
    src/sys/arch/amiga/dev/if_esreg.h src/sys/arch/amiga/dev/siop2_script.ss
cvs rdiff -u -r1.46 -r1.47 src/sys/arch/amiga/dev/if_es.c
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/amiga/stand/loadbsd/loadbsd.c
cvs rdiff -u -r1.15 -r1.16 src/sys/dev/microcode/siop/ncr53cxxx.c
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/microcode/siop/osiop.ss

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/amiga/dev/bzivsc.c
diff -u src/sys/arch/amiga/dev/bzivsc.c:1.26 src/sys/arch/amiga/dev/bzivsc.c:1.27
--- src/sys/arch/amiga/dev/bzivsc.c:1.26	Sun Apr 13 04:55:52 2008
+++ src/sys/arch/amiga/dev/bzivsc.c	Wed Oct 21 23:53:38 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: bzivsc.c,v 1.26 2008/04/13 04:55:52 tsutsui Exp $ */
+/*	$NetBSD: bzivsc.c,v 1.27 2009/10/21 23:53:38 snj Exp $ */
 
 /*
  * Copyright (c) 1997 Michael L. Hitch
@@ -13,11 +13,7 @@
  * 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 contains software written by Michael L. Hitch for
- *	the NetBSD project.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -36,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bzivsc.c,v 1.26 2008/04/13 04:55:52 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bzivsc.c,v 1.27 2009/10/21 23:53:38 snj Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>

Index: src/sys/arch/amiga/dev/bzivscvar.h
diff -u src/sys/arch/amiga/dev/bzivscvar.h:1.3 src/sys/arch/amiga/dev/bzivscvar.h:1.4
--- src/sys/arch/amiga/dev/bzivscvar.h:1.3	Sun Apr 13 04:55:52 2008
+++ src/sys/arch/amiga/dev/bzivscvar.h	Wed Oct 21 23:53:38 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: bzivscvar.h,v 1.3 2008/04/13 04:55:52 tsutsui Exp $	*/
+/*	$NetBSD: bzivscvar.h,v 1.4 2009/10/21 23:53:38 snj Exp $	*/
 
 /*
  * Copyright (c) 1997 Michael L. Hitch.
@@ -12,12 +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 for the NetBSD Project
- *	by Michael L. Hitch.
- * 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/amiga/dev/cbiiscvar.h
diff -u src/sys/arch/amiga/dev/cbiiscvar.h:1.3 src/sys/arch/amiga/dev/cbiiscvar.h:1.4
--- src/sys/arch/amiga/dev/cbiiscvar.h:1.3	Sun Apr 13 04:55:52 2008
+++ src/sys/arch/amiga/dev/cbiiscvar.h	Wed Oct 21 23:53:38 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: cbiiscvar.h,v 1.3 2008/04/13 04:55:52 tsutsui Exp $	*/
+/*	$NetBSD: cbiiscvar.h,v 1.4 2009/10/21 23:53:38 snj Exp $	*/
 
 /*
  * Copyright (c) 1997 Michael L. Hitch.
@@ -12,12 +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 for the NetBSD Project
- *	by Michael L. Hitch.
- * 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/amiga/dev/cbscvar.h
diff -u src/sys/arch/amiga/dev/cbscvar.h:1.3 src/sys/arch/amiga/dev/cbscvar.h:1.4
--- src/sys/arch/amiga/dev/cbscvar.h:1.3	Sun Apr 13 04:55:52 2008
+++ src/sys/arch/amiga/dev/cbscvar.h	Wed Oct 21 23:53:38 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: cbscvar.h,v 1.3 2008/04/13 04:55:52 tsutsui Exp $	*/
+/*	$NetBSD: cbscvar.h,v 1.4 2009/10/21 23:53:38 snj Exp $	*/
 
 /*
  * Copyright (c) 1997 Michael L. Hitch.
@@ -12,12 +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 for the NetBSD Project
- *	by Michael L. Hitch.
- * 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/amiga/dev/bzscvar.h
diff -u src/sys/arch/amiga/dev/bzscvar.h:1.5 src/sys/arch/amiga/dev/bzscvar.h:1.6
--- src/sys/arch/amiga/dev/bzscvar.h:1.5	Sun Apr 13 04:55:52 2008
+++ src/sys/arch/amiga/dev/bzscvar.h	Wed Oct 21 23:53:38 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: bzscvar.h,v 1.5 2008/04/13 04:55:52 tsutsui Exp $	*/
+/*	$NetBSD: bzscvar.h,v 1.6 2009/10/21 23:53:38 snj Exp $	*/
 
 /*
  * Copyright (c) 1997 Michael L. Hitch.
@@ -12,12 +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 for the NetBSD Project
- *	by Michael L. Hitch.
- * 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/amiga/dev/bztzscvar.h
diff -u src/sys/arch/amiga/dev/bztzscvar.h:1.4 src/sys/arch/amiga/dev/bztzscvar.h:1.5
--- src/sys/arch/amiga/dev/bztzscvar.h:1.4	Sun Apr 13 04:55:52 2008
+++ src/sys/arch/amiga/dev/bztzscvar.h	Wed Oct 21 23:53:38 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: bztzscvar.h,v 1.4 2008/04/13 04:55:52 tsutsui Exp $	*/
+/*	$NetBSD: bztzscvar.h,v 1.5 2009/10/21 23:53:38 snj Exp $	*/
 
 /*
  * Copyright (c) 1997 Michael L. Hitch.
@@ -12,12 +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 for the NetBSD Project
- *	by Michael L. Hitch.
- * 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/amiga/dev/siop_script.ss
diff -u src/sys/arch/amiga/dev/siop_script.ss:1.4 src/sys/arch/amiga/dev/siop_script.ss:1.5
--- src/sys/arch/amiga/dev/siop_script.ss:1.4	Fri Mar 26 22:50:26 1999
+++ src/sys/arch/amiga/dev/siop_script.ss	Wed Oct 21 23:53:38 2009
@@ -1,4 +1,4 @@
-;	$NetBSD: siop_script.ss,v 1.4 1999/03/26 22:50:26 mhitch Exp $
+;	$NetBSD: siop_script.ss,v 1.5 2009/10/21 23:53:38 snj Exp $
 
 ;
 ; Copyright (c) 1995 Michael L. Hitch
@@ -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 Michael L. Hitch.
-; 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/amiga/dev/cbiisc.c
diff -u src/sys/arch/amiga/dev/cbiisc.c:1.27 src/sys/arch/amiga/dev/cbiisc.c:1.28
--- src/sys/arch/amiga/dev/cbiisc.c:1.27	Sun Apr 13 04:55:52 2008
+++ src/sys/arch/amiga/dev/cbiisc.c	Wed Oct 21 23:53:38 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: cbiisc.c,v 1.27 2008/04/13 04:55:52 tsutsui Exp $ */
+/*	$NetBSD: cbiisc.c,v 1.28 2009/10/21 23:53:38 snj Exp $ */
 
 /*
  * Copyright (c) 1997 Michael L. Hitch
@@ -13,11 +13,7 @@
  * 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 contains software written by Michael L. Hitch for
- *	the NetBSD project.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -36,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cbiisc.c,v 1.27 2008/04/13 04:55:52 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cbiisc.c,v 1.28 2009/10/21 23:53:38 snj Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>

Index: src/sys/arch/amiga/dev/cbsc.c
diff -u src/sys/arch/amiga/dev/cbsc.c:1.28 src/sys/arch/amiga/dev/cbsc.c:1.29
--- src/sys/arch/amiga/dev/cbsc.c:1.28	Sun Apr 13 04:55:52 2008
+++ src/sys/arch/amiga/dev/cbsc.c	Wed Oct 21 23:53:38 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: cbsc.c,v 1.28 2008/04/13 04:55:52 tsutsui Exp $ */
+/*	$NetBSD: cbsc.c,v 1.29 2009/10/21 23:53:38 snj Exp $ */
 
 /*
  * Copyright (c) 1997 Michael L. Hitch
@@ -13,11 +13,7 @@
  * 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 contains software written by Michael L. Hitch for
- *	the NetBSD project.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -36,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cbsc.c,v 1.28 2008/04/13 04:55:52 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cbsc.c,v 1.29 2009/10/21 23:53:38 snj Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>

Index: src/sys/arch/amiga/dev/flscvar.h
diff -u src/sys/arch/amiga/dev/flscvar.h:1.6 src/sys/arch/amiga/dev/flscvar.h:1.7
--- src/sys/arch/amiga/dev/flscvar.h:1.6	Sun Apr 13 04:55:52 2008
+++ src/sys/arch/amiga/dev/flscvar.h	Wed Oct 21 23:53:38 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: flscvar.h,v 1.6 2008/04/13 04:55:52 tsutsui Exp $	*/
+/*	$NetBSD: flscvar.h,v 1.7 2009/10/21 23:53:38 snj Exp $	*/
 
 /*
  * Copyright (c) 1997 Michael L. Hitch.
@@ -12,12 +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 for the NetBSD Project
- *	by Michael L. Hitch.
- * 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/amiga/dev/if_esreg.h
diff -u src/sys/arch/amiga/dev/if_esreg.h:1.6 src/sys/arch/amiga/dev/if_esreg.h:1.7
--- src/sys/arch/amiga/dev/if_esreg.h:1.6	Tue Jan 28 22:35:05 2003
+++ src/sys/arch/amiga/dev/if_esreg.h	Wed Oct 21 23:53:38 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_esreg.h,v 1.6 2003/01/28 22:35:05 wiz Exp $	*/
+/*	$NetBSD: if_esreg.h,v 1.7 2009/10/21 23:53:38 snj Exp $	*/
 
 /*
  * Copyright (c) 1995 Michael L. Hitch
@@ -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 Michael L. Hitch.
- * 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/amiga/dev/siop2_script.ss
diff -u src/sys/arch/amiga/dev/siop2_script.ss:1.6 src/sys/arch/amiga/dev/siop2_script.ss:1.7
--- src/sys/arch/amiga/dev/siop2_script.ss:1.6	Sun Dec 11 12:16:28 2005
+++ src/sys/arch/amiga/dev/siop2_script.ss	Wed Oct 21 23:53:38 2009
@@ -1,4 +1,4 @@
-;	$NetBSD: siop2_script.ss,v 1.6 2005/12/11 12:16:28 christos Exp $
+;	$NetBSD: siop2_script.ss,v 1.7 2009/10/21 23:53:38 snj Exp $
 
 ;
 ; Copyright (c) 1998 Michael L. Hitch
@@ -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 Michael L. Hitch.
-; 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/amiga/dev/if_es.c
diff -u src/sys/arch/amiga/dev/if_es.c:1.46 src/sys/arch/amiga/dev/if_es.c:1.47
--- src/sys/arch/amiga/dev/if_es.c:1.46	Tue May 19 18:39:26 2009
+++ src/sys/arch/amiga/dev/if_es.c	Wed Oct 21 23:53:38 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_es.c,v 1.46 2009/05/19 18:39:26 phx Exp $ */
+/*	$NetBSD: if_es.c,v 1.47 2009/10/21 23:53:38 snj Exp $ */
 
 /*
  * Copyright (c) 1995 Michael L. Hitch
@@ -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 Michael L. Hitch.
- * 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
@@ -38,7 +33,7 @@
 #include "opt_ns.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_es.c,v 1.46 2009/05/19 18:39:26 phx Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_es.c,v 1.47 2009/10/21 23:53:38 snj Exp $");
 
 #include "bpfilter.h"
 

Index: src/sys/arch/amiga/stand/loadbsd/loadbsd.c
diff -u src/sys/arch/amiga/stand/loadbsd/loadbsd.c:1.33 src/sys/arch/amiga/stand/loadbsd/loadbsd.c:1.34
--- src/sys/arch/amiga/stand/loadbsd/loadbsd.c:1.33	Sat Dec 24 22:45:34 2005
+++ src/sys/arch/amiga/stand/loadbsd/loadbsd.c	Wed Oct 21 23:53:38 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: loadbsd.c,v 1.33 2005/12/24 22:45:34 perry Exp $	*/
+/*	$NetBSD: loadbsd.c,v 1.34 2009/10/21 23:53:38 snj Exp $	*/
 
 /*
  * Copyright (c) 1994 Michael L. Hitch
@@ -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 Michael L. Hitch.
- * 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/dev/microcode/siop/ncr53cxxx.c
diff -u src/sys/dev/microcode/siop/ncr53cxxx.c:1.15 src/sys/dev/microcode/siop/ncr53cxxx.c:1.16
--- src/sys/dev/microcode/siop/ncr53cxxx.c:1.15	Sun Dec 11 12:22:36 2005
+++ src/sys/dev/microcode/siop/ncr53cxxx.c	Wed Oct 21 23:53:38 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: ncr53cxxx.c,v 1.15 2005/12/11 12:22:36 christos Exp $	*/
+/*	$NetBSD: ncr53cxxx.c,v 1.16 2009/10/21 23:53:38 snj Exp $	*/
 
 /*
  * Copyright (c) 1995,1999 Michael L. Hitch
@@ -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 Michael L. Hitch.
- * 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
@@ -33,7 +28,7 @@
 /*	ncr53cxxx.c	- SCSI SCRIPTS Assembler		*/
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: ncr53cxxx.c,v 1.15 2005/12/11 12:22:36 christos Exp $");
+__RCSID("$NetBSD: ncr53cxxx.c,v 1.16 2009/10/21 23:53:38 snj Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -418,7 +413,7 @@
 	if (outfp) {
 		time_t cur_time;
 
-		fprintf(outfp, "/*\t$NetBSD: ncr53cxxx.c,v 1.15 2005/12/11 12:22:36 christos Exp $\t*/\n");
+		fprintf(outfp, "/*\t$NetBSD: ncr53cxxx.c,v 1.16 2009/10/21 23:53:38 snj Exp $\t*/\n");
 		fprintf(outfp, "/*\n");
 		fprintf(outfp, " *\tDO NOT EDIT - this file is automatically generated.\n");
 		time(&cur_time);

Index: src/sys/dev/microcode/siop/osiop.ss
diff -u src/sys/dev/microcode/siop/osiop.ss:1.1 src/sys/dev/microcode/siop/osiop.ss:1.2
--- src/sys/dev/microcode/siop/osiop.ss:1.1	Mon Apr 30 04:47:51 2001
+++ src/sys/dev/microcode/siop/osiop.ss	Wed Oct 21 23:53:38 2009
@@ -1,4 +1,4 @@
-;	$NetBSD: osiop.ss,v 1.1 2001/04/30 04:47:51 tsutsui Exp $
+;	$NetBSD: osiop.ss,v 1.2 2009/10/21 23:53:38 snj Exp $
 
 ;
 ; Copyright (c) 1995 Michael L. Hitch
@@ -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 Michael L. Hitch.
-; 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

Reply via email to