[src/trunk]: src/sys Move to 2-clause license. Approved by HAYAKAWA Koichi (...

[snj <snj%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/76c0b4b831e1
branches:  trunk
changeset: 750086:76c0b4b831e1
user:      snj <snj%NetBSD.org@localhost>
date:      Tue Dec 15 22:17:12 2009 +0000

description:
Move to 2-clause license.  Approved by HAYAKAWA Koichi (copyright holder).

diffstat:

 sys/arch/amd64/amd64/rbus_machdep.c   |   9 ++-------
 sys/arch/amd64/include/rbus_machdep.h |   8 +-------
 sys/arch/i386/i386/rbus_machdep.c     |   9 ++-------
 sys/arch/i386/include/rbus_machdep.h  |   8 +-------
 sys/arch/i386/pci/ali1543.c           |   7 ++-----
 sys/dev/cardbus/cardbus.c             |  10 ++--------
 sys/dev/cardbus/cardbus_map.c         |  10 ++--------
 sys/dev/cardbus/cardbusreg.h          |   5 +----
 sys/dev/cardbus/cardbusvar.h          |   8 +-------
 sys/dev/cardbus/cardslot.c            |  10 ++--------
 sys/dev/cardbus/cardslotvar.h         |   8 +-------
 sys/dev/cardbus/if_ex_cardbus.c       |  18 ++++++------------
 sys/dev/cardbus/rbus.c                |  10 +++-------
 sys/dev/cardbus/rbus.h                |   9 ++-------
 sys/dev/pci/pccbb.c                   |   9 ++-------
 sys/dev/pci/pccbbreg.h                |   9 ++-------
 sys/dev/pci/pccbbvar.h                |   8 ++------
 17 files changed, 34 insertions(+), 121 deletions(-)

diffs (truncated from 482 to 300 lines):

diff -r 9a35078a2359 -r 76c0b4b831e1 sys/arch/amd64/amd64/rbus_machdep.c
--- a/sys/arch/amd64/amd64/rbus_machdep.c       Tue Dec 15 21:54:22 2009 +0000
+++ b/sys/arch/amd64/amd64/rbus_machdep.c       Tue Dec 15 22:17:12 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rbus_machdep.c,v 1.2 2008/05/18 02:06:14 jmcneill Exp $        */
+/*     $NetBSD: rbus_machdep.c,v 1.3 2009/12/15 22:17:12 snj Exp $     */
 
 /*
  * Copyright (c) 1999
@@ -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 HAYAKAWA Koichi.
- * 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
@@ -31,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rbus_machdep.c,v 1.2 2008/05/18 02:06:14 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rbus_machdep.c,v 1.3 2009/12/15 22:17:12 snj Exp $");
 
 #include "opt_pcifixup.h"
 
diff -r 9a35078a2359 -r 76c0b4b831e1 sys/arch/amd64/include/rbus_machdep.h
--- a/sys/arch/amd64/include/rbus_machdep.h     Tue Dec 15 21:54:22 2009 +0000
+++ b/sys/arch/amd64/include/rbus_machdep.h     Tue Dec 15 22:17:12 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rbus_machdep.h,v 1.1 2005/12/21 22:35:41 rjs Exp $     */
+/*     $NetBSD: rbus_machdep.h,v 1.2 2009/12/15 22:17:12 snj Exp $     */
 
 /*
  * Copyright (c) 1999
@@ -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 HAYAKAWA Koichi.
- * 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
@@ -30,7 +25,6 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-
 #if !defined _ARCH_AMD64_AMD64_RBUS_MACHDEP_H_
 #define _ARCH_AMD64_AMD64_RBUS_MACHDEP_H_
 
diff -r 9a35078a2359 -r 76c0b4b831e1 sys/arch/i386/i386/rbus_machdep.c
--- a/sys/arch/i386/i386/rbus_machdep.c Tue Dec 15 21:54:22 2009 +0000
+++ b/sys/arch/i386/i386/rbus_machdep.c Tue Dec 15 22:17:12 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rbus_machdep.c,v 1.23 2008/05/18 02:06:14 jmcneill Exp $       */
+/*     $NetBSD: rbus_machdep.c,v 1.24 2009/12/15 22:17:12 snj Exp $    */
 
 /*
  * Copyright (c) 1999
@@ -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 HAYAKAWA Koichi.
- * 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
@@ -31,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rbus_machdep.c,v 1.23 2008/05/18 02:06:14 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rbus_machdep.c,v 1.24 2009/12/15 22:17:12 snj Exp $");
 
 #include "opt_pcibios.h"
 #include "opt_pcifixup.h"
diff -r 9a35078a2359 -r 76c0b4b831e1 sys/arch/i386/include/rbus_machdep.h
--- a/sys/arch/i386/include/rbus_machdep.h      Tue Dec 15 21:54:22 2009 +0000
+++ b/sys/arch/i386/include/rbus_machdep.h      Tue Dec 15 22:17:12 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rbus_machdep.h,v 1.7 2007/01/12 20:34:09 gdt Exp $     */
+/*     $NetBSD: rbus_machdep.h,v 1.8 2009/12/15 22:17:12 snj Exp $     */
 
 /*
  * Copyright (c) 1999
@@ -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 HAYAKAWA Koichi.
- * 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
@@ -30,7 +25,6 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-
 #if !defined _ARCH_I386_I386_RBUS_MACHDEP_H_
 #define _ARCH_I386_I386_RBUS_MACHDEP_H_
 
diff -r 9a35078a2359 -r 76c0b4b831e1 sys/arch/i386/pci/ali1543.c
--- a/sys/arch/i386/pci/ali1543.c       Tue Dec 15 21:54:22 2009 +0000
+++ b/sys/arch/i386/pci/ali1543.c       Tue Dec 15 22:17:12 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ali1543.c,v 1.10 2008/04/28 20:23:24 martin Exp $      */
+/*     $NetBSD: ali1543.c,v 1.11 2009/12/15 22:17:12 snj Exp $ */
 
 /*
  * Copyright (c) 2001
@@ -12,9 +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. 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
@@ -87,7 +84,7 @@
 /* HAYAKAWA Koichi wrote ALi 1543 PCI ICU code basing on VIA82C586 driver */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ali1543.c,v 1.10 2008/04/28 20:23:24 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ali1543.c,v 1.11 2009/12/15 22:17:12 snj Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff -r 9a35078a2359 -r 76c0b4b831e1 sys/dev/cardbus/cardbus.c
--- a/sys/dev/cardbus/cardbus.c Tue Dec 15 21:54:22 2009 +0000
+++ b/sys/dev/cardbus/cardbus.c Tue Dec 15 22:17:12 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cardbus.c,v 1.97 2009/05/12 12:11:17 cegger Exp $      */
+/*     $NetBSD: cardbus.c,v 1.98 2009/12/15 22:17:12 snj Exp $ */
 
 /*
  * Copyright (c) 1997, 1998, 1999 and 2000
@@ -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 by HAYAKAWA Koichi.
- * 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
@@ -33,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cardbus.c,v 1.97 2009/05/12 12:11:17 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cardbus.c,v 1.98 2009/12/15 22:17:12 snj Exp $");
 
 #include "opt_cardbus.h"
 
diff -r 9a35078a2359 -r 76c0b4b831e1 sys/dev/cardbus/cardbus_map.c
--- a/sys/dev/cardbus/cardbus_map.c     Tue Dec 15 21:54:22 2009 +0000
+++ b/sys/dev/cardbus/cardbus_map.c     Tue Dec 15 22:17:12 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cardbus_map.c,v 1.30 2009/03/15 15:45:01 cegger Exp $  */
+/*     $NetBSD: cardbus_map.c,v 1.31 2009/12/15 22:17:12 snj Exp $     */
 
 /*
  * Copyright (c) 1999 and 2000
@@ -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 by HAYAKAWA Koichi.
- * 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
@@ -33,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cardbus_map.c,v 1.30 2009/03/15 15:45:01 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cardbus_map.c,v 1.31 2009/12/15 22:17:12 snj Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff -r 9a35078a2359 -r 76c0b4b831e1 sys/dev/cardbus/cardbusreg.h
--- a/sys/dev/cardbus/cardbusreg.h      Tue Dec 15 21:54:22 2009 +0000
+++ b/sys/dev/cardbus/cardbusreg.h      Tue Dec 15 22:17:12 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cardbusreg.h,v 1.2 2007/08/30 02:39:11 dyoung Exp $ */
+/*     $NetBSD: cardbusreg.h,v 1.3 2009/12/15 22:17:12 snj Exp $ */
 
 /*
  * Copyright (c) 2001
@@ -12,9 +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. 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 -r 9a35078a2359 -r 76c0b4b831e1 sys/dev/cardbus/cardbusvar.h
--- a/sys/dev/cardbus/cardbusvar.h      Tue Dec 15 21:54:22 2009 +0000
+++ b/sys/dev/cardbus/cardbusvar.h      Tue Dec 15 22:17:12 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cardbusvar.h,v 1.43 2008/06/26 12:33:17 drochner Exp $ */
+/*     $NetBSD: cardbusvar.h,v 1.44 2009/12/15 22:17:12 snj Exp $      */
 
 /*
  * Copyright (c) 1998, 1999 and 2000
@@ -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 by the author.
- * 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 -r 9a35078a2359 -r 76c0b4b831e1 sys/dev/cardbus/cardslot.c
--- a/sys/dev/cardbus/cardslot.c        Tue Dec 15 21:54:22 2009 +0000
+++ b/sys/dev/cardbus/cardslot.c        Tue Dec 15 22:17:12 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cardslot.c,v 1.50 2009/05/21 17:32:32 dyoung Exp $     */
+/*     $NetBSD: cardslot.c,v 1.51 2009/12/15 22:17:12 snj Exp $        */
 
 /*
  * Copyright (c) 1999 and 2000
@@ -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 by HAYAKAWA Koichi.
- * 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
@@ -33,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cardslot.c,v 1.50 2009/05/21 17:32:32 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cardslot.c,v 1.51 2009/12/15 22:17:12 snj Exp $");
 
 #include "opt_cardslot.h"
 
diff -r 9a35078a2359 -r 76c0b4b831e1 sys/dev/cardbus/cardslotvar.h
--- a/sys/dev/cardbus/cardslotvar.h     Tue Dec 15 21:54:22 2009 +0000
+++ b/sys/dev/cardbus/cardslotvar.h     Tue Dec 15 22:17:12 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cardslotvar.h,v 1.15 2008/07/03 18:57:52 drochner Exp $        */
+/*     $NetBSD: cardslotvar.h,v 1.16 2009/12/15 22:17:12 snj Exp $     */
 
 /*
  * Copyright (c) 1999
@@ -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 by the author.
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
  *