summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sys/arch/hp300/dev/apci.c8
-rw-r--r--sys/arch/hp300/hp300/hpux_machdep.c8
-rw-r--r--sys/arch/hp300/hp300/vectors.s8
-rw-r--r--sys/arch/m68k/m68k/oc_cksum.s8
-rw-r--r--sys/arch/mac68k/mac68k/vectors.s8
-rw-r--r--sys/arch/mvme68k/mvme68k/hpux_machdep.c8
-rw-r--r--sys/arch/sparc/dev/if_le.c4
-rw-r--r--sys/arch/sparc/include/asm.h8
-rw-r--r--sys/arch/sparc/sparc/in_cksum.c7
9 files changed, 16 insertions, 51 deletions
diff --git a/sys/arch/hp300/dev/apci.c b/sys/arch/hp300/dev/apci.c
index f78e3316b42..3d76088ae8f 100644
--- a/sys/arch/hp300/dev/apci.c
+++ b/sys/arch/hp300/dev/apci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: apci.c,v 1.12 2002/03/14 01:26:30 millert Exp $ */
+/* $OpenBSD: apci.c,v 1.13 2003/06/04 22:08:12 deraadt Exp $ */
/* $NetBSD: apci.c,v 1.9 2000/11/02 00:35:05 eeh Exp $ */
/*-
@@ -50,11 +50,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 includes software developed by the University of
- * California, Berkeley and its contributors.
- * 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.
*
diff --git a/sys/arch/hp300/hp300/hpux_machdep.c b/sys/arch/hp300/hp300/hpux_machdep.c
index a14831ebe73..9e3e145ac6d 100644
--- a/sys/arch/hp300/hp300/hpux_machdep.c
+++ b/sys/arch/hp300/hp300/hpux_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hpux_machdep.c,v 1.15 2003/01/09 22:27:08 miod Exp $ */
+/* $OpenBSD: hpux_machdep.c,v 1.16 2003/06/04 22:08:14 deraadt Exp $ */
/* $NetBSD: hpux_machdep.c,v 1.19 1998/02/16 20:58:30 thorpej Exp $ */
/*
@@ -19,11 +19,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 includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. The name of the author may not be used to endorse or promote products
+ * 3. 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 REGENTS AND CONTRIBUTORS ``AS IS'' AND
diff --git a/sys/arch/hp300/hp300/vectors.s b/sys/arch/hp300/hp300/vectors.s
index 2892a4f9c2a..eb90cac1ea0 100644
--- a/sys/arch/hp300/hp300/vectors.s
+++ b/sys/arch/hp300/hp300/vectors.s
@@ -1,4 +1,4 @@
-| $OpenBSD: vectors.s,v 1.7 2002/04/16 23:42:20 miod Exp $
+| $OpenBSD: vectors.s,v 1.8 2003/06/04 22:08:14 deraadt Exp $
| $NetBSD: vectors.s,v 1.12 1997/07/14 19:18:32 thorpej Exp $
| Copyright (c) 1997 Jason R. Thorpe. All rights reserved.
@@ -14,11 +14,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 includes software developed by the University of
-| California, Berkeley and its contributors.
-| 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.
|
diff --git a/sys/arch/m68k/m68k/oc_cksum.s b/sys/arch/m68k/m68k/oc_cksum.s
index 7dc82ee2ead..d445298e75c 100644
--- a/sys/arch/m68k/m68k/oc_cksum.s
+++ b/sys/arch/m68k/m68k/oc_cksum.s
@@ -1,4 +1,4 @@
-| $OpenBSD: oc_cksum.s,v 1.2 1996/05/29 21:05:52 niklas Exp $
+| $OpenBSD: oc_cksum.s,v 1.3 2003/06/04 22:08:15 deraadt Exp $
| $NetBSD: oc_cksum.s,v 1.4 1994/10/26 07:51:13 cgd Exp $
| Copyright (c) 1988 Regents of the University of California.
@@ -12,11 +12,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 includes software developed by the University of
-| California, Berkeley and its contributors.
-| 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.
|
diff --git a/sys/arch/mac68k/mac68k/vectors.s b/sys/arch/mac68k/mac68k/vectors.s
index 85101bc8b5d..fe0dccc4301 100644
--- a/sys/arch/mac68k/mac68k/vectors.s
+++ b/sys/arch/mac68k/mac68k/vectors.s
@@ -1,4 +1,4 @@
-/* $OpenBSD: vectors.s,v 1.4 2002/04/16 23:42:21 miod Exp $ */
+/* $OpenBSD: vectors.s,v 1.5 2003/06/04 22:08:15 deraadt Exp $ */
| $NetBSD: vectors.s,v 1.9 1997/09/03 06:16:24 scottr Exp $
| Copyright (c) 1988 University of Utah
@@ -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 includes software developed by the University of
-| California, Berkeley and its contributors.
-| 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.
|
diff --git a/sys/arch/mvme68k/mvme68k/hpux_machdep.c b/sys/arch/mvme68k/mvme68k/hpux_machdep.c
index d0adb8c0c8c..32af6a5f1f4 100644
--- a/sys/arch/mvme68k/mvme68k/hpux_machdep.c
+++ b/sys/arch/mvme68k/mvme68k/hpux_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hpux_machdep.c,v 1.10 2003/05/11 19:41:10 deraadt Exp $ */
+/* $OpenBSD: hpux_machdep.c,v 1.11 2003/06/04 22:08:16 deraadt Exp $ */
/* $NetBSD: hpux_machdep.c,v 1.9 1997/03/16 10:00:45 thorpej Exp $ */
/*
@@ -19,11 +19,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 includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. The name of the author may not be used to endorse or promote products
+ * 3. 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 REGENTS AND CONTRIBUTORS ``AS IS'' AND
diff --git a/sys/arch/sparc/dev/if_le.c b/sys/arch/sparc/dev/if_le.c
index 3290c1cf4a9..aec7bde2391 100644
--- a/sys/arch/sparc/dev/if_le.c
+++ b/sys/arch/sparc/dev/if_le.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_le.c,v 1.22 2003/05/22 07:28:11 miod Exp $ */
+/* $OpenBSD: if_le.c,v 1.23 2003/06/04 22:08:17 deraadt Exp $ */
/* $NetBSD: if_le.c,v 1.50 1997/09/09 20:54:48 pk Exp $ */
/*-
@@ -26,8 +26,6 @@
* Harvard University.
* This product includes software developed for the NetBSD Project
* by Jason R. Thorpe.
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
* 4. 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.
diff --git a/sys/arch/sparc/include/asm.h b/sys/arch/sparc/include/asm.h
index d3382f94cda..c942f03e297 100644
--- a/sys/arch/sparc/include/asm.h
+++ b/sys/arch/sparc/include/asm.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: asm.h,v 1.3 2002/08/11 12:13:16 art Exp $ */
+/* $OpenBSD: asm.h,v 1.4 2003/06/04 22:08:17 deraadt Exp $ */
/* $NetBSD: asm.h,v 1.5 1997/07/16 15:16:43 christos Exp $ */
/*
@@ -21,11 +21,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 includes software developed by the University of
- * California, Berkeley and its contributors.
- * 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.
*
diff --git a/sys/arch/sparc/sparc/in_cksum.c b/sys/arch/sparc/sparc/in_cksum.c
index bbf512bd85c..e8ba21ee143 100644
--- a/sys/arch/sparc/sparc/in_cksum.c
+++ b/sys/arch/sparc/sparc/in_cksum.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: in_cksum.c,v 1.9 2003/06/02 23:27:55 millert Exp $ */
+/* $OpenBSD: in_cksum.c,v 1.10 2003/06/04 22:08:17 deraadt Exp $ */
/* $NetBSD: in_cksum.c,v 1.7 1996/10/05 23:44:34 mrg Exp $ */
/*
@@ -8,11 +8,6 @@
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
- * All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, and it's contributors.
- *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met: