Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys Switch to a 2 clause license. Approved by joff@ (copyri...



details:   https://anonhg.NetBSD.org/src/rev/3c59a887ebbc
branches:  trunk
changeset: 748394:3c59a887ebbc
user:      snj <snj%NetBSD.org@localhost>
date:      Fri Oct 23 00:39:29 2009 +0000

description:
Switch to a 2 clause license.  Approved by joff@ (copyright holder).

diffstat:

 sys/arch/arm/at91/at91_bus_dma.c     |   7 ++-----
 sys/arch/arm/ep93xx/ep93xx_busdma.c  |   7 ++-----
 sys/arch/arm/ep93xx/ep93xx_intr.h    |   9 +--------
 sys/arch/arm/ep93xx/ep93xx_space.c   |  10 ++--------
 sys/arch/arm/ep93xx/ep93xxreg.h      |   8 +-------
 sys/arch/arm/ep93xx/ep93xxvar.h      |   8 +-------
 sys/arch/arm/ep93xx/epclk.c          |  11 ++---------
 sys/arch/arm/ep93xx/epclkreg.h       |   8 +-------
 sys/arch/arm/ep93xx/epcomreg.h       |   8 +-------
 sys/arch/arm/ep93xx/epcomvar.h       |  10 ++--------
 sys/arch/arm/ep93xx/epe.c            |  11 ++---------
 sys/arch/arm/ep93xx/epereg.h         |   8 +-------
 sys/arch/arm/ep93xx/epevar.h         |  10 ++--------
 sys/arch/arm/ep93xx/epsoc.c          |  11 ++---------
 sys/arch/arm/ep93xx/epsocvar.h       |   8 +-------
 sys/arch/evbarm/stand/board/epcom.c  |   9 +--------
 sys/arch/evbarm/stand/board/ts7200.c |   9 +--------
 sys/arch/evbarm/tsarm/tsarmreg.h     |   9 +--------
 sys/arch/evbarm/tsarm/tspld.c        |  11 ++---------
 sys/dev/isa/tsdioreg.h               |   9 +--------
 sys/dev/isa/tsdiovar.h               |   9 +--------
 21 files changed, 30 insertions(+), 160 deletions(-)

diffs (truncated from 533 to 300 lines):

diff -r aa90704840c7 -r 3c59a887ebbc sys/arch/arm/at91/at91_bus_dma.c
--- a/sys/arch/arm/at91/at91_bus_dma.c  Thu Oct 22 23:10:22 2009 +0000
+++ b/sys/arch/arm/at91/at91_bus_dma.c  Fri Oct 23 00:39:29 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: at91_bus_dma.c,v 1.2 2008/07/03 01:15:38 matt Exp $ */
+/*     $NetBSD: at91_bus_dma.c,v 1.3 2009/10/23 00:39:29 snj Exp $ */
 
 /*
  * Copyright (c) 2004 Jesse Off
@@ -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. Neither the name of The Fujitsu Component Limited nor the name of
- *    Genetec corporation may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY FUJITSU COMPONENT LIMITED AND GENETEC
  * CORPORATION ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
@@ -36,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: at91_bus_dma.c,v 1.2 2008/07/03 01:15:38 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: at91_bus_dma.c,v 1.3 2009/10/23 00:39:29 snj Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff -r aa90704840c7 -r 3c59a887ebbc sys/arch/arm/ep93xx/ep93xx_busdma.c
--- a/sys/arch/arm/ep93xx/ep93xx_busdma.c       Thu Oct 22 23:10:22 2009 +0000
+++ b/sys/arch/arm/ep93xx/ep93xx_busdma.c       Fri Oct 23 00:39:29 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ep93xx_busdma.c,v 1.2 2005/12/11 12:16:45 christos Exp $ */
+/*     $NetBSD: ep93xx_busdma.c,v 1.3 2009/10/23 00:39:30 snj Exp $ */
 
 /*
  * Copyright (c) 2004 Jesse Off
@@ -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. Neither the name of The Fujitsu Component Limited nor the name of
- *    Genetec corporation may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY FUJITSU COMPONENT LIMITED AND GENETEC
  * CORPORATION ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
@@ -36,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ep93xx_busdma.c,v 1.2 2005/12/11 12:16:45 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ep93xx_busdma.c,v 1.3 2009/10/23 00:39:30 snj Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff -r aa90704840c7 -r 3c59a887ebbc sys/arch/arm/ep93xx/ep93xx_intr.h
--- a/sys/arch/arm/ep93xx/ep93xx_intr.h Thu Oct 22 23:10:22 2009 +0000
+++ b/sys/arch/arm/ep93xx/ep93xx_intr.h Fri Oct 23 00:39:29 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ep93xx_intr.h,v 1.4 2008/04/27 18:58:44 matt Exp $     */
+/*     $NetBSD: ep93xx_intr.h,v 1.5 2009/10/23 00:39:30 snj Exp $      */
 
 /*
  * Copyright (c) 2004 Jesse Off
@@ -12,13 +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 for the NetBSD Project by
- *      Wasabi Systems, Inc.
- * 4. The name of Wasabi Systems, Inc. may not be used to endorse
- *    or promote products derived from this software without specific prior
- *    written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY WASABI SYSTEMS, INC. ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
diff -r aa90704840c7 -r 3c59a887ebbc sys/arch/arm/ep93xx/ep93xx_space.c
--- a/sys/arch/arm/ep93xx/ep93xx_space.c        Thu Oct 22 23:10:22 2009 +0000
+++ b/sys/arch/arm/ep93xx/ep93xx_space.c        Fri Oct 23 00:39:29 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ep93xx_space.c,v 1.3 2005/11/24 13:08:32 yamt Exp $ */
+/*     $NetBSD: ep93xx_space.c,v 1.4 2009/10/23 00:39:30 snj Exp $ */
 
 /*
  * Copyright (c) 2004 Jesse Off
@@ -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 Ichiro FUKUHARA.
- * 4. The name of the company nor the name of the author may be used to
- *    endorse or promote products derived from this software without specific
- *    prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY ICHIRO FUKUHARA ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -33,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ep93xx_space.c,v 1.3 2005/11/24 13:08:32 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ep93xx_space.c,v 1.4 2009/10/23 00:39:30 snj Exp $");
 
 /*
  * bus_space I/O functions for ep93xx
diff -r aa90704840c7 -r 3c59a887ebbc sys/arch/arm/ep93xx/ep93xxreg.h
--- a/sys/arch/arm/ep93xx/ep93xxreg.h   Thu Oct 22 23:10:22 2009 +0000
+++ b/sys/arch/arm/ep93xx/ep93xxreg.h   Fri Oct 23 00:39:29 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ep93xxreg.h,v 1.6 2006/02/13 12:13:20 hamajima Exp $ */
+/*     $NetBSD: ep93xxreg.h,v 1.7 2009/10/23 00:39:30 snj Exp $ */
 
 /*
  * Copyright (c) 2004 Jesse Off
@@ -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 Ichiro FUKUHARA.
- * 4. The name of the company nor the name of the author may be used to
- *    endorse or promote products derived from this software without specific
- *    prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY ICHIRO FUKUHARA ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
diff -r aa90704840c7 -r 3c59a887ebbc sys/arch/arm/ep93xx/ep93xxvar.h
--- a/sys/arch/arm/ep93xx/ep93xxvar.h   Thu Oct 22 23:10:22 2009 +0000
+++ b/sys/arch/arm/ep93xx/ep93xxvar.h   Fri Oct 23 00:39:29 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ep93xxvar.h,v 1.2 2005/12/11 12:16:45 christos Exp $ */
+/*     $NetBSD: ep93xxvar.h,v 1.3 2009/10/23 00:39:30 snj Exp $ */
 /*
  * Copyright (c) 2004 Jesse Off
  * All rights reserved.
@@ -11,12 +11,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 Ichiro FUKUHARA.
- * 4. The name of the company nor the name of the author may be used to
- *    endorse or promote products derived from this software without specific
- *    prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY ICHIRO FUKUHARA ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
diff -r aa90704840c7 -r 3c59a887ebbc sys/arch/arm/ep93xx/epclk.c
--- a/sys/arch/arm/ep93xx/epclk.c       Thu Oct 22 23:10:22 2009 +0000
+++ b/sys/arch/arm/ep93xx/epclk.c       Fri Oct 23 00:39:29 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: epclk.c,v 1.16 2008/12/19 04:26:35 kenh Exp $  */
+/*     $NetBSD: epclk.c,v 1.17 2009/10/23 00:39:30 snj Exp $   */
 
 /*
  * Copyright (c) 2004 Jesse Off
@@ -12,13 +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 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
@@ -47,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: epclk.c,v 1.16 2008/12/19 04:26:35 kenh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: epclk.c,v 1.17 2009/10/23 00:39:30 snj Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
diff -r aa90704840c7 -r 3c59a887ebbc sys/arch/arm/ep93xx/epclkreg.h
--- a/sys/arch/arm/ep93xx/epclkreg.h    Thu Oct 22 23:10:22 2009 +0000
+++ b/sys/arch/arm/ep93xx/epclkreg.h    Fri Oct 23 00:39:29 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: epclkreg.h,v 1.2 2005/11/12 05:33:23 hamajima Exp $ */
+/*     $NetBSD: epclkreg.h,v 1.3 2009/10/23 00:39:30 snj Exp $ */
 
 /*
  * Copyright (c) 2004 Jesse Off
@@ -11,12 +11,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 Ichiro FUKUHARA.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY ICHIRO FUKUHARA AND CONTRIBUTORS ``AS IS''
  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
diff -r aa90704840c7 -r 3c59a887ebbc sys/arch/arm/ep93xx/epcomreg.h
--- a/sys/arch/arm/ep93xx/epcomreg.h    Thu Oct 22 23:10:22 2009 +0000
+++ b/sys/arch/arm/ep93xx/epcomreg.h    Fri Oct 23 00:39:29 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: epcomreg.h,v 1.2 2005/12/11 12:16:45 christos Exp $ */
+/*     $NetBSD: epcomreg.h,v 1.3 2009/10/23 00:39:30 snj Exp $ */
 
 /*
  * Copyright (c) 2004 Jesse Off
@@ -11,12 +11,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 Ichiro FUKUHARA.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY ICHIRO FUKUHARA AND CONTRIBUTORS ``AS IS''
  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
diff -r aa90704840c7 -r 3c59a887ebbc sys/arch/arm/ep93xx/epcomvar.h
--- a/sys/arch/arm/ep93xx/epcomvar.h    Thu Oct 22 23:10:22 2009 +0000
+++ b/sys/arch/arm/ep93xx/epcomvar.h    Fri Oct 23 00:39:29 2009 +0000
@@ -1,4 +1,4 @@
-/*      $NetBSD: epcomvar.h,v 1.3 2005/12/11 12:16:45 christos Exp $        */
+/*      $NetBSD: epcomvar.h,v 1.4 2009/10/23 00:39:30 snj Exp $        */
 /*-
  * Copyright (c) 2004 Jesse Off
  *
@@ -10,13 +10,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 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 REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
diff -r aa90704840c7 -r 3c59a887ebbc sys/arch/arm/ep93xx/epe.c
--- a/sys/arch/arm/ep93xx/epe.c Thu Oct 22 23:10:22 2009 +0000
+++ b/sys/arch/arm/ep93xx/epe.c Fri Oct 23 00:39:29 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: epe.c,v 1.21 2009/03/18 16:00:09 cegger Exp $  */
+/*     $NetBSD: epe.c,v 1.22 2009/10/23 00:39:30 snj Exp $     */
 
 /*
  * Copyright (c) 2004 Jesse Off
@@ -12,13 +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 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
@@ -34,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: epe.c,v 1.21 2009/03/18 16:00:09 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: epe.c,v 1.22 2009/10/23 00:39:30 snj Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
diff -r aa90704840c7 -r 3c59a887ebbc sys/arch/arm/ep93xx/epereg.h
--- a/sys/arch/arm/ep93xx/epereg.h      Thu Oct 22 23:10:22 2009 +0000
+++ b/sys/arch/arm/ep93xx/epereg.h      Fri Oct 23 00:39:29 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: epereg.h,v 1.3 2005/12/11 12:16:45 christos Exp $ */
+/*     $NetBSD: epereg.h,v 1.4 2009/10/23 00:39:30 snj Exp $ */
 
 /*
  * Copyright (c) 2004 Jesse Off
@@ -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



Home | Main Index | Thread Index | Old Index