summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2003-06-04 17:04:06 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2003-06-04 17:04:06 +0000
commit0c5da668b2ed8eacf42aea5ea3827daaa6756024 (patch)
tree02d89273440b08ff2374324079b5ef04f5a7b9f2
parent81570950644bfeebd019911879dbd39725afe924 (diff)
fix some 3/4 for toby
-rw-r--r--sys/arch/i386/stand/libsa/biosprobe.c7
-rw-r--r--sys/arch/i386/stand/libsa/disk.h7
-rw-r--r--sys/arch/i386/stand/libsa/diskprobe.c7
-rw-r--r--sys/arch/i386/stand/libsa/pciprobe.c7
-rw-r--r--sys/arch/i386/stand/libsa/smpprobe.c7
5 files changed, 5 insertions, 30 deletions
diff --git a/sys/arch/i386/stand/libsa/biosprobe.c b/sys/arch/i386/stand/libsa/biosprobe.c
index fddf1b2ed57..4b0a67e1e91 100644
--- a/sys/arch/i386/stand/libsa/biosprobe.c
+++ b/sys/arch/i386/stand/libsa/biosprobe.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: biosprobe.c,v 1.1 2002/06/20 20:22:58 weingart Exp $ */
+/* $OpenBSD: biosprobe.c,v 1.2 2003/06/04 17:04:05 deraadt Exp $ */
/*
* Copyright (c) 2002 Tobias Weingartner
@@ -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 Tobias Weingartner.
- * 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 --git a/sys/arch/i386/stand/libsa/disk.h b/sys/arch/i386/stand/libsa/disk.h
index 35a684c5d51..469c4d9aec1 100644
--- a/sys/arch/i386/stand/libsa/disk.h
+++ b/sys/arch/i386/stand/libsa/disk.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: disk.h,v 1.2 2002/03/14 01:26:34 millert Exp $ */
+/* $OpenBSD: disk.h,v 1.3 2003/06/04 17:04:05 deraadt Exp $ */
/*
* Copyright (c) 1997 Tobias Weingartner
@@ -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 Tobias Weingartner.
- * 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
diff --git a/sys/arch/i386/stand/libsa/diskprobe.c b/sys/arch/i386/stand/libsa/diskprobe.c
index a5efd53a913..838269901e7 100644
--- a/sys/arch/i386/stand/libsa/diskprobe.c
+++ b/sys/arch/i386/stand/libsa/diskprobe.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: diskprobe.c,v 1.19 2003/05/31 00:15:29 weingart Exp $ */
+/* $OpenBSD: diskprobe.c,v 1.20 2003/06/04 17:04:05 deraadt Exp $ */
/*
* Copyright (c) 1997 Tobias Weingartner
@@ -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 Tobias Weingartner.
- * 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
diff --git a/sys/arch/i386/stand/libsa/pciprobe.c b/sys/arch/i386/stand/libsa/pciprobe.c
index b78f5cc1b5f..362c176cfc3 100644
--- a/sys/arch/i386/stand/libsa/pciprobe.c
+++ b/sys/arch/i386/stand/libsa/pciprobe.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pciprobe.c,v 1.5 2000/10/25 17:12:07 mickey Exp $ */
+/* $OpenBSD: pciprobe.c,v 1.6 2003/06/04 17:04:05 deraadt Exp $ */
/*
* Copyright (c) 1997 Tobias Weingartner
@@ -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 Tobias Weingartner.
- * 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
diff --git a/sys/arch/i386/stand/libsa/smpprobe.c b/sys/arch/i386/stand/libsa/smpprobe.c
index d40a5050d14..dc968aba759 100644
--- a/sys/arch/i386/stand/libsa/smpprobe.c
+++ b/sys/arch/i386/stand/libsa/smpprobe.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: smpprobe.c,v 1.3 1998/09/27 17:42:07 mickey Exp $ */
+/* $OpenBSD: smpprobe.c,v 1.4 2003/06/04 17:04:05 deraadt Exp $ */
/*
* Copyright (c) 1997 Tobias Weingartner
@@ -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 Tobias Weingartner.
- * 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