4 files changed, 4 insertions, 32 deletions
diff --git a/sys/dev/microcode/adw/advmcode.c b/sys/dev/microcode/adw/advmcode.c
index e2af8459416..2ad0588e4c4 100644
--- a/sys/dev/microcode/adw/advmcode.c
+++ b/sys/dev/microcode/adw/advmcode.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: advmcode.c,v 1.1 2005/09/06 02:18:20 krw Exp $	*/
+/*	$OpenBSD: advmcode.c,v 1.2 2008/06/26 05:42:16 ray Exp $	*/
 /*      $NetBSD: advmcode.c,v 1.3 1998/09/26 16:02:57 dante Exp $        */
 
 /*
@@ -18,13 +18,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 the NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
diff --git a/sys/dev/microcode/adw/advmcode.h b/sys/dev/microcode/adw/advmcode.h
index 5eedcc2e5fe..a9d9d9112f2 100644
--- a/sys/dev/microcode/adw/advmcode.h
+++ b/sys/dev/microcode/adw/advmcode.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: advmcode.h,v 1.1 2005/09/06 02:18:20 krw Exp $	*/
+/*	$OpenBSD: advmcode.h,v 1.2 2008/06/26 05:42:16 ray Exp $	*/
 /*      $NetBSD: advmcode.h,v 1.3 1998/09/26 16:02:57 dante Exp $        */
 
 /*
@@ -18,13 +18,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 the NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
diff --git a/sys/dev/microcode/adw/adwmcode.c b/sys/dev/microcode/adw/adwmcode.c
index 58c7ede3937..6047964a198 100644
--- a/sys/dev/microcode/adw/adwmcode.c
+++ b/sys/dev/microcode/adw/adwmcode.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: adwmcode.c,v 1.2 2001/11/06 19:53:19 miod Exp $ */
+/*	$OpenBSD: adwmcode.c,v 1.3 2008/06/26 05:42:16 ray Exp $ */
 /*      $NetBSD: adwmcode.c,v 1.5 2000/05/27 18:24:50 dante Exp $        */
 
 /*
@@ -18,13 +18,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 the NetBSD
- *      Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
diff --git a/sys/dev/microcode/adw/adwmcode.h b/sys/dev/microcode/adw/adwmcode.h
index c789f934035..9cfcafaad3f 100644
--- a/sys/dev/microcode/adw/adwmcode.h
+++ b/sys/dev/microcode/adw/adwmcode.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: adwmcode.h,v 1.3 2003/02/11 19:20:27 mickey Exp $ */
+/*	$OpenBSD: adwmcode.h,v 1.4 2008/06/26 05:42:16 ray Exp $ */
 /*      $NetBSD: adwmcode.h,v 1.5 2000/05/27 18:24:51 dante Exp $        */
 
 /*
@@ -18,13 +18,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 the NetBSD
- *      Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED