summaryrefslogtreecommitdiff
path: root/sys/arch/hp300/dev
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch/hp300/dev')
-rw-r--r--sys/arch/hp300/dev/ac.c8
-rw-r--r--sys/arch/hp300/dev/acioctl.h8
-rw-r--r--sys/arch/hp300/dev/acvar.h8
-rw-r--r--sys/arch/hp300/dev/ct.c8
-rw-r--r--sys/arch/hp300/dev/ctreg.h8
-rw-r--r--sys/arch/hp300/dev/dca.c8
-rw-r--r--sys/arch/hp300/dev/dcareg.h8
-rw-r--r--sys/arch/hp300/dev/dcm.c8
-rw-r--r--sys/arch/hp300/dev/dcmreg.h8
-rw-r--r--sys/arch/hp300/dev/dma.c8
-rw-r--r--sys/arch/hp300/dev/dmareg.h8
-rw-r--r--sys/arch/hp300/dev/dmavar.h8
-rw-r--r--sys/arch/hp300/dev/fhpib.c8
-rw-r--r--sys/arch/hp300/dev/fhpibreg.h8
-rw-r--r--sys/arch/hp300/dev/grf.c8
-rw-r--r--sys/arch/hp300/dev/grf_dv.c8
-rw-r--r--sys/arch/hp300/dev/grf_dvreg.h8
-rw-r--r--sys/arch/hp300/dev/grf_gb.c8
-rw-r--r--sys/arch/hp300/dev/grf_gbreg.h8
-rw-r--r--sys/arch/hp300/dev/grf_hy.c8
-rw-r--r--sys/arch/hp300/dev/grf_hyreg.h8
-rw-r--r--sys/arch/hp300/dev/grf_rb.c8
-rw-r--r--sys/arch/hp300/dev/grf_rbreg.h8
-rw-r--r--sys/arch/hp300/dev/grf_tc.c8
-rw-r--r--sys/arch/hp300/dev/grf_tcreg.h8
-rw-r--r--sys/arch/hp300/dev/grfioctl.h8
-rw-r--r--sys/arch/hp300/dev/grfreg.h8
-rw-r--r--sys/arch/hp300/dev/grfvar.h8
-rw-r--r--sys/arch/hp300/dev/hd.c8
-rw-r--r--sys/arch/hp300/dev/hdreg.h8
-rw-r--r--sys/arch/hp300/dev/hdvar.h8
-rw-r--r--sys/arch/hp300/dev/hil.c8
-rw-r--r--sys/arch/hp300/dev/hil_keymaps.c8
-rw-r--r--sys/arch/hp300/dev/hilioctl.h8
-rw-r--r--sys/arch/hp300/dev/hilreg.h8
-rw-r--r--sys/arch/hp300/dev/hilvar.h8
-rw-r--r--sys/arch/hp300/dev/hpib.c8
-rw-r--r--sys/arch/hp300/dev/hpibvar.h8
-rw-r--r--sys/arch/hp300/dev/if_le.c8
-rw-r--r--sys/arch/hp300/dev/if_lereg.h8
-rw-r--r--sys/arch/hp300/dev/if_levar.h8
-rw-r--r--sys/arch/hp300/dev/iotypes.h8
-rw-r--r--sys/arch/hp300/dev/ite.c8
-rw-r--r--sys/arch/hp300/dev/ite_subr.c8
-rw-r--r--sys/arch/hp300/dev/itereg.h8
-rw-r--r--sys/arch/hp300/dev/itevar.h8
-rw-r--r--sys/arch/hp300/dev/kbdmap.h8
-rw-r--r--sys/arch/hp300/dev/maskbits.h8
-rw-r--r--sys/arch/hp300/dev/nhpib.c8
-rw-r--r--sys/arch/hp300/dev/nhpibreg.h8
-rw-r--r--sys/arch/hp300/dev/ppi.c8
-rw-r--r--sys/arch/hp300/dev/ppiioctl.h8
-rw-r--r--sys/arch/hp300/dev/scsi.c8
-rw-r--r--sys/arch/hp300/dev/scsireg.h8
-rw-r--r--sys/arch/hp300/dev/scsivar.h8
-rw-r--r--sys/arch/hp300/dev/sd.c8
-rw-r--r--sys/arch/hp300/dev/sdvar.h8
-rw-r--r--sys/arch/hp300/dev/st.c8
-rw-r--r--sys/arch/hp300/dev/stvar.h8
59 files changed, 118 insertions, 354 deletions
diff --git a/sys/arch/hp300/dev/ac.c b/sys/arch/hp300/dev/ac.c
index c2d25f066e6..79afe6b15cf 100644
--- a/sys/arch/hp300/dev/ac.c
+++ b/sys/arch/hp300/dev/ac.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ac.c,v 1.12 2002/12/25 20:40:36 miod Exp $ */
+/* $OpenBSD: ac.c,v 1.13 2003/06/02 23:27:44 millert Exp $ */
/* $NetBSD: ac.c,v 1.9 1997/04/02 22:37:21 scottr 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. 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/dev/acioctl.h b/sys/arch/hp300/dev/acioctl.h
index 1c09209f210..1184214c7c9 100644
--- a/sys/arch/hp300/dev/acioctl.h
+++ b/sys/arch/hp300/dev/acioctl.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: acioctl.h,v 1.2 1997/01/12 15:12:18 downsj Exp $ */
+/* $OpenBSD: acioctl.h,v 1.3 2003/06/02 23:27:44 millert Exp $ */
/* $NetBSD: acioctl.h,v 1.2 1994/10/26 07:23:25 cgd Exp $ */
/*
@@ -18,11 +18,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/dev/acvar.h b/sys/arch/hp300/dev/acvar.h
index afe4c2e6eda..2680fbd05f5 100644
--- a/sys/arch/hp300/dev/acvar.h
+++ b/sys/arch/hp300/dev/acvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: acvar.h,v 1.5 2002/03/14 01:26:30 millert Exp $ */
+/* $OpenBSD: acvar.h,v 1.6 2003/06/02 23:27:44 millert Exp $ */
/* $NetBSD: acvar.h,v 1.4 1997/03/31 07:32:15 scottr Exp $ */
/*
@@ -18,11 +18,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/dev/ct.c b/sys/arch/hp300/dev/ct.c
index 979f52cd15d..d707030e46b 100644
--- a/sys/arch/hp300/dev/ct.c
+++ b/sys/arch/hp300/dev/ct.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ct.c,v 1.9 2002/05/23 15:31:57 art Exp $ */
+/* $OpenBSD: ct.c,v 1.10 2003/06/02 23:27:44 millert Exp $ */
/* $NetBSD: ct.c,v 1.21 1997/04/02 22:37:23 scottr Exp $ */
/*
@@ -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/hp300/dev/ctreg.h b/sys/arch/hp300/dev/ctreg.h
index 2ba97fb73b6..327f827c2c1 100644
--- a/sys/arch/hp300/dev/ctreg.h
+++ b/sys/arch/hp300/dev/ctreg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ctreg.h,v 1.4 1997/01/12 15:12:20 downsj Exp $ */
+/* $OpenBSD: ctreg.h,v 1.5 2003/06/02 23:27:44 millert Exp $ */
/* $NetBSD: ctreg.h,v 1.6 1996/02/09 18:00:35 scottr Exp $ */
/*
@@ -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/hp300/dev/dca.c b/sys/arch/hp300/dev/dca.c
index 78652a5b716..97c037d3fa3 100644
--- a/sys/arch/hp300/dev/dca.c
+++ b/sys/arch/hp300/dev/dca.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dca.c,v 1.15 2002/03/14 01:26:30 millert Exp $ */
+/* $OpenBSD: dca.c,v 1.16 2003/06/02 23:27:44 millert Exp $ */
/* $NetBSD: dca.c,v 1.35 1997/05/05 20:58:18 thorpej Exp $ */
/*
@@ -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/hp300/dev/dcareg.h b/sys/arch/hp300/dev/dcareg.h
index 6b65d3169ab..e8c03d7cf74 100644
--- a/sys/arch/hp300/dev/dcareg.h
+++ b/sys/arch/hp300/dev/dcareg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: dcareg.h,v 1.5 2001/09/23 22:01:38 millert Exp $ */
+/* $OpenBSD: dcareg.h,v 1.6 2003/06/02 23:27:44 millert Exp $ */
/* $NetBSD: dcareg.h,v 1.6 1996/02/24 00:55:02 thorpej Exp $ */
/*
@@ -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/hp300/dev/dcm.c b/sys/arch/hp300/dev/dcm.c
index 5114370dd05..a313ccbe432 100644
--- a/sys/arch/hp300/dev/dcm.c
+++ b/sys/arch/hp300/dev/dcm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dcm.c,v 1.13 2002/03/14 01:26:30 millert Exp $ */
+/* $OpenBSD: dcm.c,v 1.14 2003/06/02 23:27:44 millert Exp $ */
/* $NetBSD: dcm.c,v 1.41 1997/05/05 20:59:16 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. 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/dev/dcmreg.h b/sys/arch/hp300/dev/dcmreg.h
index 4c7fe75e63d..5fadb0b1870 100644
--- a/sys/arch/hp300/dev/dcmreg.h
+++ b/sys/arch/hp300/dev/dcmreg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: dcmreg.h,v 1.3 1997/01/12 15:12:23 downsj Exp $ */
+/* $OpenBSD: dcmreg.h,v 1.4 2003/06/02 23:27:44 millert Exp $ */
/* $NetBSD: dcmreg.h,v 1.5 1996/02/24 00:55:05 thorpej Exp $ */
/*
@@ -18,11 +18,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/dev/dma.c b/sys/arch/hp300/dev/dma.c
index 0f577c73520..d99d2b32681 100644
--- a/sys/arch/hp300/dev/dma.c
+++ b/sys/arch/hp300/dev/dma.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dma.c,v 1.12 2002/03/14 01:26:30 millert Exp $ */
+/* $OpenBSD: dma.c,v 1.13 2003/06/02 23:27:44 millert Exp $ */
/* $NetBSD: dma.c,v 1.19 1997/05/05 21:02:39 thorpej Exp $ */
/*
@@ -15,11 +15,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/dev/dmareg.h b/sys/arch/hp300/dev/dmareg.h
index defc90c22f4..46fb7867c7e 100644
--- a/sys/arch/hp300/dev/dmareg.h
+++ b/sys/arch/hp300/dev/dmareg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: dmareg.h,v 1.7 2001/11/04 02:58:51 miod Exp $ */
+/* $OpenBSD: dmareg.h,v 1.8 2003/06/02 23:27:44 millert Exp $ */
/* $NetBSD: dmareg.h,v 1.12 1997/05/05 21:02:40 thorpej Exp $ */
/*
@@ -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/hp300/dev/dmavar.h b/sys/arch/hp300/dev/dmavar.h
index cfb8897fa3e..0aa76903e8a 100644
--- a/sys/arch/hp300/dev/dmavar.h
+++ b/sys/arch/hp300/dev/dmavar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: dmavar.h,v 1.5 2002/03/14 01:26:30 millert Exp $ */
+/* $OpenBSD: dmavar.h,v 1.6 2003/06/02 23:27:44 millert Exp $ */
/* $NetBSD: dmavar.h,v 1.9 1997/04/01 03:10:59 scottr Exp $ */
/*
@@ -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/hp300/dev/fhpib.c b/sys/arch/hp300/dev/fhpib.c
index aa9c9df07c2..af80c3d1433 100644
--- a/sys/arch/hp300/dev/fhpib.c
+++ b/sys/arch/hp300/dev/fhpib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fhpib.c,v 1.10 2002/03/14 01:26:30 millert Exp $ */
+/* $OpenBSD: fhpib.c,v 1.11 2003/06/02 23:27:44 millert Exp $ */
/* $NetBSD: fhpib.c,v 1.18 1997/05/05 21:04:16 thorpej Exp $ */
/*
@@ -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/hp300/dev/fhpibreg.h b/sys/arch/hp300/dev/fhpibreg.h
index 1aa1d45a781..d30661b963d 100644
--- a/sys/arch/hp300/dev/fhpibreg.h
+++ b/sys/arch/hp300/dev/fhpibreg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: fhpibreg.h,v 1.2 1997/01/12 15:12:30 downsj Exp $ */
+/* $OpenBSD: fhpibreg.h,v 1.3 2003/06/02 23:27:44 millert Exp $ */
/* $NetBSD: fhpibreg.h,v 1.4 1994/10/26 07:23:45 cgd Exp $ */
/*
@@ -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/hp300/dev/grf.c b/sys/arch/hp300/dev/grf.c
index 8872de31e07..8f4cc5709db 100644
--- a/sys/arch/hp300/dev/grf.c
+++ b/sys/arch/hp300/dev/grf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: grf.c,v 1.21 2003/05/09 23:09:20 art Exp $ */
+/* $OpenBSD: grf.c,v 1.22 2003/06/02 23:27:44 millert Exp $ */
/* $NetBSD: grf.c,v 1.30 1998/08/20 08:33:41 kleink Exp $ */
/*
@@ -18,11 +18,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/dev/grf_dv.c b/sys/arch/hp300/dev/grf_dv.c
index c26649795d8..cf152646d88 100644
--- a/sys/arch/hp300/dev/grf_dv.c
+++ b/sys/arch/hp300/dev/grf_dv.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: grf_dv.c,v 1.8 2002/03/14 01:26:30 millert Exp $ */
+/* $OpenBSD: grf_dv.c,v 1.9 2003/06/02 23:27:44 millert Exp $ */
/* $NetBSD: grf_dv.c,v 1.11 1997/03/31 07:34:14 scottr 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. 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/dev/grf_dvreg.h b/sys/arch/hp300/dev/grf_dvreg.h
index d156424416b..489e8fb3ef4 100644
--- a/sys/arch/hp300/dev/grf_dvreg.h
+++ b/sys/arch/hp300/dev/grf_dvreg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: grf_dvreg.h,v 1.2 1997/01/12 15:12:33 downsj Exp $ */
+/* $OpenBSD: grf_dvreg.h,v 1.3 2003/06/02 23:27:44 millert Exp $ */
/* $NetBSD: grf_dvreg.h,v 1.5 1994/10/26 07:23:50 cgd Exp $ */
/*
@@ -18,11 +18,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/dev/grf_gb.c b/sys/arch/hp300/dev/grf_gb.c
index dfb7bed13d1..1832eb58dc2 100644
--- a/sys/arch/hp300/dev/grf_gb.c
+++ b/sys/arch/hp300/dev/grf_gb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: grf_gb.c,v 1.7 2002/03/14 01:26:30 millert Exp $ */
+/* $OpenBSD: grf_gb.c,v 1.8 2003/06/02 23:27:44 millert Exp $ */
/* $NetBSD: grf_gb.c,v 1.11 1997/03/31 07:34:15 scottr 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. 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/dev/grf_gbreg.h b/sys/arch/hp300/dev/grf_gbreg.h
index 187aeb2a9f4..44288972527 100644
--- a/sys/arch/hp300/dev/grf_gbreg.h
+++ b/sys/arch/hp300/dev/grf_gbreg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: grf_gbreg.h,v 1.2 1997/01/12 15:12:34 downsj Exp $ */
+/* $OpenBSD: grf_gbreg.h,v 1.3 2003/06/02 23:27:44 millert Exp $ */
/* $NetBSD: grf_gbreg.h,v 1.4 1994/10/26 07:23:53 cgd Exp $ */
/*
@@ -18,11 +18,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/dev/grf_hy.c b/sys/arch/hp300/dev/grf_hy.c
index 96939b98c80..94bac3bcd0d 100644
--- a/sys/arch/hp300/dev/grf_hy.c
+++ b/sys/arch/hp300/dev/grf_hy.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: grf_hy.c,v 1.8 2002/03/14 01:26:30 millert Exp $ */
+/* $OpenBSD: grf_hy.c,v 1.9 2003/06/02 23:27:44 millert Exp $ */
/* $NetBSD: grf_hy.c,v 1.9 1997/03/31 07:34:16 scottr Exp $ */
/*
@@ -20,11 +20,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/dev/grf_hyreg.h b/sys/arch/hp300/dev/grf_hyreg.h
index 9e23836fc8a..0bf7c6cb936 100644
--- a/sys/arch/hp300/dev/grf_hyreg.h
+++ b/sys/arch/hp300/dev/grf_hyreg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: grf_hyreg.h,v 1.2 1997/01/12 15:12:35 downsj Exp $ */
+/* $OpenBSD: grf_hyreg.h,v 1.3 2003/06/02 23:27:44 millert Exp $ */
/* $NetBSD: grf_hyreg.h,v 1.2 1994/10/26 07:23:57 cgd 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. 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/dev/grf_rb.c b/sys/arch/hp300/dev/grf_rb.c
index 3646030227f..95808ea44b3 100644
--- a/sys/arch/hp300/dev/grf_rb.c
+++ b/sys/arch/hp300/dev/grf_rb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: grf_rb.c,v 1.9 2003/03/21 16:18:29 miod Exp $ */
+/* $OpenBSD: grf_rb.c,v 1.10 2003/06/02 23:27:44 millert Exp $ */
/* $NetBSD: grf_rb.c,v 1.11 1997/03/31 07:34:17 scottr 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. 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/dev/grf_rbreg.h b/sys/arch/hp300/dev/grf_rbreg.h
index 98686b9eb5c..538f4f4b645 100644
--- a/sys/arch/hp300/dev/grf_rbreg.h
+++ b/sys/arch/hp300/dev/grf_rbreg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: grf_rbreg.h,v 1.2 1997/01/12 15:12:37 downsj Exp $ */
+/* $OpenBSD: grf_rbreg.h,v 1.3 2003/06/02 23:27:44 millert Exp $ */
/* $NetBSD: grf_rbreg.h,v 1.4 1994/10/26 07:24:03 cgd Exp $ */
/*
@@ -18,11 +18,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/dev/grf_tc.c b/sys/arch/hp300/dev/grf_tc.c
index 13a5f3f7ac8..d6eeff7c23a 100644
--- a/sys/arch/hp300/dev/grf_tc.c
+++ b/sys/arch/hp300/dev/grf_tc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: grf_tc.c,v 1.10 2002/12/06 02:17:42 deraadt Exp $ */
+/* $OpenBSD: grf_tc.c,v 1.11 2003/06/02 23:27:44 millert Exp $ */
/* $NetBSD: grf_tc.c,v 1.11 1997/03/31 07:34:18 scottr 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. 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/dev/grf_tcreg.h b/sys/arch/hp300/dev/grf_tcreg.h
index b3146f0100c..cc7c2cf0395 100644
--- a/sys/arch/hp300/dev/grf_tcreg.h
+++ b/sys/arch/hp300/dev/grf_tcreg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: grf_tcreg.h,v 1.2 1997/01/12 15:12:39 downsj Exp $ */
+/* $OpenBSD: grf_tcreg.h,v 1.3 2003/06/02 23:27:44 millert Exp $ */
/* $NetBSD: grf_tcreg.h,v 1.6 1994/10/26 07:24:06 cgd Exp $ */
/*
@@ -18,11 +18,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/dev/grfioctl.h b/sys/arch/hp300/dev/grfioctl.h
index 0ffe7a36c9a..b720e2081bb 100644
--- a/sys/arch/hp300/dev/grfioctl.h
+++ b/sys/arch/hp300/dev/grfioctl.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: grfioctl.h,v 1.3 2003/04/03 06:47:58 jmc Exp $ */
+/* $OpenBSD: grfioctl.h,v 1.4 2003/06/02 23:27:44 millert Exp $ */
/* $NetBSD: grfioctl.h,v 1.5 1994/10/26 07:24:08 cgd Exp $ */
/*
@@ -18,11 +18,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/dev/grfreg.h b/sys/arch/hp300/dev/grfreg.h
index e69b02df4bc..94d907a129e 100644
--- a/sys/arch/hp300/dev/grfreg.h
+++ b/sys/arch/hp300/dev/grfreg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: grfreg.h,v 1.2 1997/01/12 15:12:40 downsj Exp $ */
+/* $OpenBSD: grfreg.h,v 1.3 2003/06/02 23:27:44 millert Exp $ */
/* $NetBSD: grfreg.h,v 1.2 1994/10/26 07:24:09 cgd Exp $ */
/*
@@ -18,11 +18,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/dev/grfvar.h b/sys/arch/hp300/dev/grfvar.h
index 59ebc83f359..80476f09837 100644
--- a/sys/arch/hp300/dev/grfvar.h
+++ b/sys/arch/hp300/dev/grfvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: grfvar.h,v 1.8 2002/03/14 03:15:52 millert Exp $ */
+/* $OpenBSD: grfvar.h,v 1.9 2003/06/02 23:27:44 millert Exp $ */
/* $NetBSD: grfvar.h,v 1.10 1997/03/31 07:34:19 scottr Exp $ */
/*
@@ -18,11 +18,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/dev/hd.c b/sys/arch/hp300/dev/hd.c
index 0867e7948f3..a71bd88d24d 100644
--- a/sys/arch/hp300/dev/hd.c
+++ b/sys/arch/hp300/dev/hd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hd.c,v 1.22 2003/04/06 15:28:25 krw Exp $ */
+/* $OpenBSD: hd.c,v 1.23 2003/06/02 23:27:44 millert Exp $ */
/* $NetBSD: rd.c,v 1.33 1997/07/10 18:14:08 kleink 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. 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/dev/hdreg.h b/sys/arch/hp300/dev/hdreg.h
index 0ffa53a09e4..ed7868addd3 100644
--- a/sys/arch/hp300/dev/hdreg.h
+++ b/sys/arch/hp300/dev/hdreg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: hdreg.h,v 1.1 1997/02/03 08:11:55 downsj Exp $ */
+/* $OpenBSD: hdreg.h,v 1.2 2003/06/02 23:27:44 millert Exp $ */
/* $NetBSD: rdreg.h,v 1.7 1996/02/09 18:00:37 scottr Exp $ */
/*
@@ -18,11 +18,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/dev/hdvar.h b/sys/arch/hp300/dev/hdvar.h
index a69b31f3d18..a0548f910eb 100644
--- a/sys/arch/hp300/dev/hdvar.h
+++ b/sys/arch/hp300/dev/hdvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: hdvar.h,v 1.4 2002/12/25 20:56:59 miod Exp $ */
+/* $OpenBSD: hdvar.h,v 1.5 2003/06/02 23:27:44 millert Exp $ */
/* $NetBSD: rdvar.h,v 1.6 1997/01/30 09:14:19 thorpej Exp $ */
/*
@@ -18,11 +18,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/dev/hil.c b/sys/arch/hp300/dev/hil.c
index 167aa7ccd2a..0785e4f08bb 100644
--- a/sys/arch/hp300/dev/hil.c
+++ b/sys/arch/hp300/dev/hil.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hil.c,v 1.17 2003/02/02 02:56:26 miod Exp $ */
+/* $OpenBSD: hil.c,v 1.18 2003/06/02 23:27:44 millert Exp $ */
/* $NetBSD: hil.c,v 1.34 1997/04/02 22:37:32 scottr Exp $ */
/*
@@ -18,11 +18,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/dev/hil_keymaps.c b/sys/arch/hp300/dev/hil_keymaps.c
index 514b9222806..a1207a3e9f0 100644
--- a/sys/arch/hp300/dev/hil_keymaps.c
+++ b/sys/arch/hp300/dev/hil_keymaps.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hil_keymaps.c,v 1.4 1997/04/16 11:56:07 downsj Exp $ */
+/* $OpenBSD: hil_keymaps.c,v 1.5 2003/06/02 23:27:44 millert Exp $ */
/* $NetBSD: hil_keymaps.c,v 1.7 1997/03/31 07:34:22 scottr Exp $ */
/*
@@ -18,11 +18,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/dev/hilioctl.h b/sys/arch/hp300/dev/hilioctl.h
index 54c7ba453c4..fa75e5ba01c 100644
--- a/sys/arch/hp300/dev/hilioctl.h
+++ b/sys/arch/hp300/dev/hilioctl.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: hilioctl.h,v 1.2 1997/01/12 15:12:43 downsj Exp $ */
+/* $OpenBSD: hilioctl.h,v 1.3 2003/06/02 23:27:44 millert Exp $ */
/* $NetBSD: hilioctl.h,v 1.6 1994/10/26 07:24:14 cgd Exp $ */
/*
@@ -18,11 +18,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/dev/hilreg.h b/sys/arch/hp300/dev/hilreg.h
index 453689a2800..2b2f7737c78 100644
--- a/sys/arch/hp300/dev/hilreg.h
+++ b/sys/arch/hp300/dev/hilreg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: hilreg.h,v 1.3 1997/02/04 06:21:24 downsj Exp $ */
+/* $OpenBSD: hilreg.h,v 1.4 2003/06/02 23:27:44 millert Exp $ */
/* $NetBSD: hilreg.h,v 1.6 1997/02/02 09:39:21 thorpej Exp $ */
/*
@@ -18,11 +18,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/dev/hilvar.h b/sys/arch/hp300/dev/hilvar.h
index 23eaf2a9549..5e9e6195e1c 100644
--- a/sys/arch/hp300/dev/hilvar.h
+++ b/sys/arch/hp300/dev/hilvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: hilvar.h,v 1.5 2002/03/14 01:26:30 millert Exp $ */
+/* $OpenBSD: hilvar.h,v 1.6 2003/06/02 23:27:44 millert Exp $ */
/* $NetBSD: hilvar.h,v 1.14 1997/04/01 19:29:10 scottr Exp $ */
/*
@@ -18,11 +18,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/dev/hpib.c b/sys/arch/hp300/dev/hpib.c
index 1c0f75f8ff5..3ef5983265f 100644
--- a/sys/arch/hp300/dev/hpib.c
+++ b/sys/arch/hp300/dev/hpib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hpib.c,v 1.9 2002/03/14 01:26:30 millert Exp $ */
+/* $OpenBSD: hpib.c,v 1.10 2003/06/02 23:27:44 millert Exp $ */
/* $NetBSD: hpib.c,v 1.16 1997/04/27 20:58:57 thorpej Exp $ */
/*
@@ -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/hp300/dev/hpibvar.h b/sys/arch/hp300/dev/hpibvar.h
index 220a55e2b3d..70c1e40587d 100644
--- a/sys/arch/hp300/dev/hpibvar.h
+++ b/sys/arch/hp300/dev/hpibvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: hpibvar.h,v 1.7 2002/03/14 01:26:30 millert Exp $ */
+/* $OpenBSD: hpibvar.h,v 1.8 2003/06/02 23:27:44 millert Exp $ */
/* $NetBSD: hpibvar.h,v 1.10 1997/03/31 07:34:25 scottr Exp $ */
/*
@@ -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/hp300/dev/if_le.c b/sys/arch/hp300/dev/if_le.c
index 81937267e6c..0934fc88efc 100644
--- a/sys/arch/hp300/dev/if_le.c
+++ b/sys/arch/hp300/dev/if_le.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_le.c,v 1.14 2002/03/14 01:26:30 millert Exp $ */
+/* $OpenBSD: if_le.c,v 1.15 2003/06/02 23:27:45 millert Exp $ */
/* $NetBSD: if_le.c,v 1.43 1997/05/05 21:05:32 thorpej Exp $ */
/*-
@@ -17,11 +17,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/dev/if_lereg.h b/sys/arch/hp300/dev/if_lereg.h
index 7bb7fcc24c9..1f4247b7b1f 100644
--- a/sys/arch/hp300/dev/if_lereg.h
+++ b/sys/arch/hp300/dev/if_lereg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_lereg.h,v 1.3 1997/01/12 15:12:46 downsj Exp $ */
+/* $OpenBSD: if_lereg.h,v 1.4 2003/06/02 23:27:45 millert Exp $ */
/* $NetBSD: if_lereg.h,v 1.8 1995/12/10 00:49:36 mycroft Exp $ */
/*
@@ -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/hp300/dev/if_levar.h b/sys/arch/hp300/dev/if_levar.h
index 29e401a890d..3b18cc3d140 100644
--- a/sys/arch/hp300/dev/if_levar.h
+++ b/sys/arch/hp300/dev/if_levar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_levar.h,v 1.5 1997/04/16 11:56:10 downsj Exp $ */
+/* $OpenBSD: if_levar.h,v 1.6 2003/06/02 23:27:45 millert Exp $ */
/* $NetBSD: if_levar.h,v 1.8 1997/04/14 02:30:45 thorpej Exp $ */
/*-
@@ -17,11 +17,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/dev/iotypes.h b/sys/arch/hp300/dev/iotypes.h
index c21e717af95..7a52a188bb8 100644
--- a/sys/arch/hp300/dev/iotypes.h
+++ b/sys/arch/hp300/dev/iotypes.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: iotypes.h,v 1.2 1997/01/12 15:12:48 downsj Exp $ */
+/* $OpenBSD: iotypes.h,v 1.3 2003/06/02 23:27:45 millert Exp $ */
/* $NetBSD: iotypes.h,v 1.2 1994/10/26 07:24:24 cgd Exp $ */
/*
@@ -18,11 +18,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/dev/ite.c b/sys/arch/hp300/dev/ite.c
index 8bae218cee2..58bd3ed7174 100644
--- a/sys/arch/hp300/dev/ite.c
+++ b/sys/arch/hp300/dev/ite.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ite.c,v 1.14 2002/03/14 01:26:30 millert Exp $ */
+/* $OpenBSD: ite.c,v 1.15 2003/06/02 23:27:45 millert Exp $ */
/* $NetBSD: ite.c,v 1.38 1997/03/31 07:37:25 scottr 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. 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/dev/ite_subr.c b/sys/arch/hp300/dev/ite_subr.c
index b30695517fa..da5ae8033b1 100644
--- a/sys/arch/hp300/dev/ite_subr.c
+++ b/sys/arch/hp300/dev/ite_subr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ite_subr.c,v 1.4 1997/04/16 11:56:11 downsj Exp $ */
+/* $OpenBSD: ite_subr.c,v 1.5 2003/06/02 23:27:45 millert Exp $ */
/* $NetBSD: ite_subr.c,v 1.8 1997/03/31 07:37:26 scottr Exp $ */
/*
@@ -18,11 +18,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/dev/itereg.h b/sys/arch/hp300/dev/itereg.h
index 3ccb0c0f88e..6f7967c6891 100644
--- a/sys/arch/hp300/dev/itereg.h
+++ b/sys/arch/hp300/dev/itereg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: itereg.h,v 1.2 1997/01/12 15:12:52 downsj Exp $ */
+/* $OpenBSD: itereg.h,v 1.3 2003/06/02 23:27:45 millert Exp $ */
/* $NetBSD: itereg.h,v 1.5 1994/10/26 07:24:39 cgd Exp $ */
/*
@@ -18,11 +18,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/dev/itevar.h b/sys/arch/hp300/dev/itevar.h
index c5d7c652acf..3c321b7efdf 100644
--- a/sys/arch/hp300/dev/itevar.h
+++ b/sys/arch/hp300/dev/itevar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: itevar.h,v 1.10 2002/03/14 01:26:30 millert Exp $ */
+/* $OpenBSD: itevar.h,v 1.11 2003/06/02 23:27:45 millert Exp $ */
/* $NetBSD: itevar.h,v 1.14 1997/03/31 07:37:27 scottr Exp $ */
/*
@@ -18,11 +18,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/dev/kbdmap.h b/sys/arch/hp300/dev/kbdmap.h
index c48ce3adcea..ee5eebddf27 100644
--- a/sys/arch/hp300/dev/kbdmap.h
+++ b/sys/arch/hp300/dev/kbdmap.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: kbdmap.h,v 1.3 1997/01/12 15:12:53 downsj Exp $ */
+/* $OpenBSD: kbdmap.h,v 1.4 2003/06/02 23:27:45 millert Exp $ */
/* $NetBSD: kbdmap.h,v 1.7 1996/10/05 05:22:11 thorpej Exp $ */
/*
@@ -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/hp300/dev/maskbits.h b/sys/arch/hp300/dev/maskbits.h
index db2f2e79380..bf116c92d47 100644
--- a/sys/arch/hp300/dev/maskbits.h
+++ b/sys/arch/hp300/dev/maskbits.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: maskbits.h,v 1.3 1997/04/16 11:56:12 downsj Exp $ */
+/* $OpenBSD: maskbits.h,v 1.4 2003/06/02 23:27:45 millert Exp $ */
/* $NetBSD: maskbits.h,v 1.3 1997/03/31 07:37:28 scottr Exp $ */
/*-
@@ -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/hp300/dev/nhpib.c b/sys/arch/hp300/dev/nhpib.c
index 4d4be010427..3f6482f17de 100644
--- a/sys/arch/hp300/dev/nhpib.c
+++ b/sys/arch/hp300/dev/nhpib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: nhpib.c,v 1.11 2002/03/14 01:26:30 millert Exp $ */
+/* $OpenBSD: nhpib.c,v 1.12 2003/06/02 23:27:45 millert Exp $ */
/* $NetBSD: nhpib.c,v 1.17 1997/05/05 21:06:41 thorpej Exp $ */
/*
@@ -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/hp300/dev/nhpibreg.h b/sys/arch/hp300/dev/nhpibreg.h
index e80cdabfaa8..5a580cdea4c 100644
--- a/sys/arch/hp300/dev/nhpibreg.h
+++ b/sys/arch/hp300/dev/nhpibreg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: nhpibreg.h,v 1.2 1997/01/12 15:12:56 downsj Exp $ */
+/* $OpenBSD: nhpibreg.h,v 1.3 2003/06/02 23:27:45 millert Exp $ */
/* $NetBSD: nhpibreg.h,v 1.5 1995/01/07 10:30:15 mycroft Exp $ */
/*
@@ -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/hp300/dev/ppi.c b/sys/arch/hp300/dev/ppi.c
index ca30436f61f..11e7574a4c3 100644
--- a/sys/arch/hp300/dev/ppi.c
+++ b/sys/arch/hp300/dev/ppi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ppi.c,v 1.10 2002/06/09 05:23:26 miod Exp $ */
+/* $OpenBSD: ppi.c,v 1.11 2003/06/02 23:27:45 millert Exp $ */
/* $NetBSD: ppi.c,v 1.13 1997/04/02 22:37:33 scottr Exp $ */
/*
@@ -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/hp300/dev/ppiioctl.h b/sys/arch/hp300/dev/ppiioctl.h
index 52d0dcf3cff..4a0acc8fea9 100644
--- a/sys/arch/hp300/dev/ppiioctl.h
+++ b/sys/arch/hp300/dev/ppiioctl.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ppiioctl.h,v 1.2 1997/01/12 15:12:58 downsj Exp $ */
+/* $OpenBSD: ppiioctl.h,v 1.3 2003/06/02 23:27:45 millert Exp $ */
/* $NetBSD: ppiioctl.h,v 1.4 1994/10/26 07:24:48 cgd Exp $ */
/*
@@ -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/hp300/dev/scsi.c b/sys/arch/hp300/dev/scsi.c
index ffddff19c3a..50fed565e99 100644
--- a/sys/arch/hp300/dev/scsi.c
+++ b/sys/arch/hp300/dev/scsi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: scsi.c,v 1.14 2003/04/03 17:01:29 millert Exp $ */
+/* $OpenBSD: scsi.c,v 1.15 2003/06/02 23:27:45 millert Exp $ */
/* $NetBSD: scsi.c,v 1.21 1997/05/05 21:08:26 thorpej Exp $ */
/*
@@ -17,11 +17,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/dev/scsireg.h b/sys/arch/hp300/dev/scsireg.h
index 2ddbc961f4f..03a246c4660 100644
--- a/sys/arch/hp300/dev/scsireg.h
+++ b/sys/arch/hp300/dev/scsireg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: scsireg.h,v 1.2 1997/01/12 15:13:02 downsj Exp $ */
+/* $OpenBSD: scsireg.h,v 1.3 2003/06/02 23:27:45 millert Exp $ */
/* $NetBSD: scsireg.h,v 1.4 1994/10/26 07:24:59 cgd Exp $ */
/*
@@ -16,11 +16,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/dev/scsivar.h b/sys/arch/hp300/dev/scsivar.h
index 2a8634fd733..6beeeae655f 100644
--- a/sys/arch/hp300/dev/scsivar.h
+++ b/sys/arch/hp300/dev/scsivar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: scsivar.h,v 1.6 2002/03/14 01:26:30 millert Exp $ */
+/* $OpenBSD: scsivar.h,v 1.7 2003/06/02 23:27:45 millert Exp $ */
/* $NetBSD: scsivar.h,v 1.7 1997/03/31 07:40:05 scottr Exp $ */
/*
@@ -17,11 +17,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/dev/sd.c b/sys/arch/hp300/dev/sd.c
index fda61269fbc..5a02b64aac5 100644
--- a/sys/arch/hp300/dev/sd.c
+++ b/sys/arch/hp300/dev/sd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sd.c,v 1.29 2003/04/06 15:28:25 krw Exp $ */
+/* $OpenBSD: sd.c,v 1.30 2003/06/02 23:27:45 millert Exp $ */
/* $NetBSD: sd.c,v 1.34 1997/07/10 18:14:10 kleink Exp $ */
/*
@@ -17,11 +17,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/dev/sdvar.h b/sys/arch/hp300/dev/sdvar.h
index 5be443977c5..e74377b04e3 100644
--- a/sys/arch/hp300/dev/sdvar.h
+++ b/sys/arch/hp300/dev/sdvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: sdvar.h,v 1.11 2002/12/25 20:56:59 miod Exp $ */
+/* $OpenBSD: sdvar.h,v 1.12 2003/06/02 23:27:45 millert Exp $ */
/* $NetBSD: sdvar.h,v 1.7 1997/03/31 07:40:07 scottr Exp $ */
/*
@@ -16,11 +16,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/dev/st.c b/sys/arch/hp300/dev/st.c
index 9e0d1b5a8b7..a66e857da4f 100644
--- a/sys/arch/hp300/dev/st.c
+++ b/sys/arch/hp300/dev/st.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: st.c,v 1.15 2002/12/25 20:40:36 miod Exp $ */
+/* $OpenBSD: st.c,v 1.16 2003/06/02 23:27:45 millert Exp $ */
/* $NetBSD: st.c,v 1.22 1997/04/02 22:37:38 scottr 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. 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/dev/stvar.h b/sys/arch/hp300/dev/stvar.h
index 81b2fc0bca9..d2e3eb38f37 100644
--- a/sys/arch/hp300/dev/stvar.h
+++ b/sys/arch/hp300/dev/stvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: stvar.h,v 1.4 2002/03/14 01:26:30 millert Exp $ */
+/* $OpenBSD: stvar.h,v 1.5 2003/06/02 23:27:45 millert Exp $ */
/* $NetBSD: stvar.h,v 1.6 1997/04/02 22:37:40 scottr Exp $ */
/*
@@ -18,11 +18,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.
*