Source-Changes-HG archive

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

[src/trunk]: src/sys Drop 3rd and 4th clauses from Ichiro FUKUHARA's license.



details:   https://anonhg.NetBSD.org/src/rev/5adb630c7ed6
branches:  trunk
changeset: 748345:5adb630c7ed6
user:      rmind <rmind%NetBSD.org@localhost>
date:      Wed Oct 21 14:15:50 2009 +0000

description:
Drop 3rd and 4th clauses from Ichiro FUKUHARA's license.
Reviewed and approved by ichiro@ (copyright holder).

diffstat:

 sys/arch/arm/ixp12x0/ixp12x0.c               |  10 ++--------
 sys/arch/arm/ixp12x0/ixp12x0_clkreg.h        |   8 +-------
 sys/arch/arm/ixp12x0/ixp12x0_comreg.h        |   8 +-------
 sys/arch/arm/ixp12x0/ixp12x0_io.c            |  10 ++--------
 sys/arch/arm/ixp12x0/ixp12x0_pci_dma.c       |  10 ++--------
 sys/arch/arm/ixp12x0/ixp12x0_pcireg.h        |   8 +-------
 sys/arch/arm/ixp12x0/ixp12x0reg.h            |   8 +-------
 sys/arch/arm/ixp12x0/ixp12x0var.h            |   8 +-------
 sys/arch/arm/ixp12x0/ixpsip.c                |  10 ++--------
 sys/arch/arm/ixp12x0/ixpsipvar.h             |   8 +-------
 sys/arch/arm/omap/omap_start.S               |   8 +-------
 sys/arch/arm/xscale/ixp425.c                 |  10 ++--------
 sys/arch/arm/xscale/ixp425_intr.c            |  10 ++--------
 sys/arch/arm/xscale/ixp425_pci.c             |  10 ++--------
 sys/arch/arm/xscale/ixp425_pci_dma.c         |  10 ++--------
 sys/arch/arm/xscale/ixp425_pci_space.c       |  10 ++--------
 sys/arch/arm/xscale/ixp425_sip.c             |  10 ++--------
 sys/arch/arm/xscale/ixp425_sipvar.h          |   8 +-------
 sys/arch/arm/xscale/ixp425_space.c           |  10 ++--------
 sys/arch/arm/xscale/ixp425_timer.c           |  10 ++--------
 sys/arch/arm/xscale/ixp425reg.h              |   8 +-------
 sys/arch/arm/xscale/ixp425var.h              |   8 +-------
 sys/arch/evbarm/armadillo/armadillo9_com.c   |  10 ++--------
 sys/arch/evbarm/armadillo/armadillo9_start.S |   8 +-------
 sys/arch/evbarm/beagle/beagle_start.S        |   8 +-------
 sys/arch/evbarm/gemini/gemini_start.S        |  10 ++--------
 sys/arch/evbarm/ixdp425/ixdp425_led.c        |  10 ++--------
 sys/arch/evbarm/ixdp425/ixdp425_machdep.c    |  10 ++--------
 sys/arch/evbarm/ixdp425/ixdp425_mainbus.c    |  10 ++--------
 sys/arch/evbarm/ixdp425/ixdp425_pci.c        |  10 ++--------
 sys/arch/evbarm/ixdp425/ixdp425_start.S      |   8 +-------
 sys/arch/evbarm/ixdp425/ixdp425reg.h         |   8 +-------
 sys/arch/evbarm/ixdp425/ixdp425var.h         |   8 +-------
 sys/arch/evbarm/ixm1200/ixm1200_machdep.c    |  10 ++--------
 sys/arch/evbarm/ixm1200/ixm1200_pci.c        |  10 ++--------
 sys/arch/evbarm/ixm1200/ixm1200reg.h         |   8 +-------
 sys/arch/evbarm/ixm1200/ixm1200var.h         |   8 +-------
 sys/arch/evbarm/ixm1200/ixp12x0_mainbus.c    |  10 ++--------
 sys/arch/evbarm/ixm1200/ixpcom_ixm.c         |  10 ++--------
 sys/arch/evbarm/ixm1200/ixpcom_ixmvar.h      |   8 +-------
 sys/arch/evbarm/ixm1200/nappi_nppb.c         |  10 ++--------
 sys/arch/evbarm/nslu2/nslu2_machdep.c        |  10 ++--------
 sys/arch/evbarm/nslu2/nslu2_pci.c            |  10 ++--------
 sys/arch/evbarm/tisdp24xx/sdp24xx_start.S    |   8 +-------
 sys/arch/evbarm/tsarm/epcom_ts.c             |  10 ++--------
 sys/arch/evbarm/tsarm/epcom_tsvar.h          |   8 +-------
 sys/arch/evbarm/tsarm/tsarm_start.S          |   8 +-------
 sys/dev/cardbus/if_ath_cardbus.c             |  10 ++--------
 48 files changed, 75 insertions(+), 363 deletions(-)

diffs (truncated from 1305 to 300 lines):

diff -r 41abe19e89d4 -r 5adb630c7ed6 sys/arch/arm/ixp12x0/ixp12x0.c
--- a/sys/arch/arm/ixp12x0/ixp12x0.c    Wed Oct 21 13:56:36 2009 +0000
+++ b/sys/arch/arm/ixp12x0/ixp12x0.c    Wed Oct 21 14:15:50 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ixp12x0.c,v 1.15 2009/03/14 15:36:02 dsl Exp $ */
+/*     $NetBSD: ixp12x0.c,v 1.16 2009/10/21 14:15:50 rmind Exp $ */
 /*
  * Copyright (c) 2002, 2003
  *     Ichiro FUKUHARA <ichiro%ichiro.org@localhost>.
@@ -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: ixp12x0.c,v 1.15 2009/03/14 15:36:02 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixp12x0.c,v 1.16 2009/10/21 14:15:50 rmind Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff -r 41abe19e89d4 -r 5adb630c7ed6 sys/arch/arm/ixp12x0/ixp12x0_clkreg.h
--- a/sys/arch/arm/ixp12x0/ixp12x0_clkreg.h     Wed Oct 21 13:56:36 2009 +0000
+++ b/sys/arch/arm/ixp12x0/ixp12x0_clkreg.h     Wed Oct 21 14:15:50 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ixp12x0_clkreg.h,v 1.3 2003/03/06 06:14:16 igy Exp $ */
+/*     $NetBSD: ixp12x0_clkreg.h,v 1.4 2009/10/21 14:15:50 rmind Exp $ */
 
 /*
  * Copyright (c) 2002
@@ -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. 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 41abe19e89d4 -r 5adb630c7ed6 sys/arch/arm/ixp12x0/ixp12x0_comreg.h
--- a/sys/arch/arm/ixp12x0/ixp12x0_comreg.h     Wed Oct 21 13:56:36 2009 +0000
+++ b/sys/arch/arm/ixp12x0/ixp12x0_comreg.h     Wed Oct 21 14:15:50 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ixp12x0_comreg.h,v 1.7 2003/03/06 06:14:16 igy Exp $ */
+/*     $NetBSD: ixp12x0_comreg.h,v 1.8 2009/10/21 14:15:50 rmind Exp $ */
 
 /*
  * Copyright (c) 2002
@@ -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. 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 41abe19e89d4 -r 5adb630c7ed6 sys/arch/arm/ixp12x0/ixp12x0_io.c
--- a/sys/arch/arm/ixp12x0/ixp12x0_io.c Wed Oct 21 13:56:36 2009 +0000
+++ b/sys/arch/arm/ixp12x0/ixp12x0_io.c Wed Oct 21 14:15:50 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ixp12x0_io.c,v 1.12 2009/03/14 21:04:05 dsl Exp $ */
+/*     $NetBSD: ixp12x0_io.c,v 1.13 2009/10/21 14:15:50 rmind Exp $ */
 
 /*
  * Copyright (c) 2002, 2003
@@ -13,12 +13,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
@@ -34,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ixp12x0_io.c,v 1.12 2009/03/14 21:04:05 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixp12x0_io.c,v 1.13 2009/10/21 14:15:50 rmind Exp $");
 
 /*
  * bus_space I/O functions for ixp12x0
diff -r 41abe19e89d4 -r 5adb630c7ed6 sys/arch/arm/ixp12x0/ixp12x0_pci_dma.c
--- a/sys/arch/arm/ixp12x0/ixp12x0_pci_dma.c    Wed Oct 21 13:56:36 2009 +0000
+++ b/sys/arch/arm/ixp12x0/ixp12x0_pci_dma.c    Wed Oct 21 14:15:50 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ixp12x0_pci_dma.c,v 1.6 2003/03/25 06:12:47 igy Exp $ */
+/*     $NetBSD: ixp12x0_pci_dma.c,v 1.7 2009/10/21 14:15:50 rmind Exp $ */
 /*
  * Copyright (c) 2002, 2003
  *     Ichiro FUKUHARA <ichiro%ichiro.org@localhost>.
@@ -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: ixp12x0_pci_dma.c,v 1.6 2003/03/25 06:12:47 igy Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixp12x0_pci_dma.c,v 1.7 2009/10/21 14:15:50 rmind Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff -r 41abe19e89d4 -r 5adb630c7ed6 sys/arch/arm/ixp12x0/ixp12x0_pcireg.h
--- a/sys/arch/arm/ixp12x0/ixp12x0_pcireg.h     Wed Oct 21 13:56:36 2009 +0000
+++ b/sys/arch/arm/ixp12x0/ixp12x0_pcireg.h     Wed Oct 21 14:15:50 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ixp12x0_pcireg.h,v 1.2 2003/02/17 20:51:52 ichiro Exp $ */
+/*     $NetBSD: ixp12x0_pcireg.h,v 1.3 2009/10/21 14:15:50 rmind Exp $ */
 
 /*
  * Copyright (c) 2002, 2003
@@ -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. 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 41abe19e89d4 -r 5adb630c7ed6 sys/arch/arm/ixp12x0/ixp12x0reg.h
--- a/sys/arch/arm/ixp12x0/ixp12x0reg.h Wed Oct 21 13:56:36 2009 +0000
+++ b/sys/arch/arm/ixp12x0/ixp12x0reg.h Wed Oct 21 14:15:50 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ixp12x0reg.h,v 1.6 2005/12/11 12:16:50 christos Exp $ */
+/*     $NetBSD: ixp12x0reg.h,v 1.7 2009/10/21 14:15:50 rmind Exp $ */
 
 /*
  * Copyright (c) 2002, 2003
@@ -13,12 +13,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 41abe19e89d4 -r 5adb630c7ed6 sys/arch/arm/ixp12x0/ixp12x0var.h
--- a/sys/arch/arm/ixp12x0/ixp12x0var.h Wed Oct 21 13:56:36 2009 +0000
+++ b/sys/arch/arm/ixp12x0/ixp12x0var.h Wed Oct 21 14:15:50 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ixp12x0var.h,v 1.7 2005/12/11 12:16:50 christos Exp $ */
+/*     $NetBSD: ixp12x0var.h,v 1.8 2009/10/21 14:15:50 rmind Exp $ */
 /*
  * Copyright (c) 2002
  *     Ichiro FUKUHARA <ichiro%ichiro.org@localhost>.
@@ -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 41abe19e89d4 -r 5adb630c7ed6 sys/arch/arm/ixp12x0/ixpsip.c
--- a/sys/arch/arm/ixp12x0/ixpsip.c     Wed Oct 21 13:56:36 2009 +0000
+++ b/sys/arch/arm/ixp12x0/ixpsip.c     Wed Oct 21 14:15:50 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ixpsip.c,v 1.11 2009/03/14 15:36:02 dsl Exp $ */
+/*     $NetBSD: ixpsip.c,v 1.12 2009/10/21 14:15:50 rmind Exp $ */
 
 /*
  * Copyright (c) 2002
@@ -13,12 +13,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
@@ -34,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ixpsip.c,v 1.11 2009/03/14 15:36:02 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixpsip.c,v 1.12 2009/10/21 14:15:50 rmind Exp $");
 
 /*
  * Slow peripheral bus of ixp12x0 Processor
diff -r 41abe19e89d4 -r 5adb630c7ed6 sys/arch/arm/ixp12x0/ixpsipvar.h
--- a/sys/arch/arm/ixp12x0/ixpsipvar.h  Wed Oct 21 13:56:36 2009 +0000
+++ b/sys/arch/arm/ixp12x0/ixpsipvar.h  Wed Oct 21 14:15:50 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ixpsipvar.h,v 1.1 2002/07/15 16:27:17 ichiro Exp $ */
+/*     $NetBSD: ixpsipvar.h,v 1.2 2009/10/21 14:15:50 rmind Exp $ */
 /*
  * Copyright (c) 2002
  *     Ichiro FUKUHARA <ichiro%ichiro.org@localhost>.
@@ -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 41abe19e89d4 -r 5adb630c7ed6 sys/arch/arm/omap/omap_start.S
--- a/sys/arch/arm/omap/omap_start.S    Wed Oct 21 13:56:36 2009 +0000
+++ b/sys/arch/arm/omap/omap_start.S    Wed Oct 21 14:15:50 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: omap_start.S,v 1.2 2008/04/27 18:58:45 matt Exp $ */
+/*     $NetBSD: omap_start.S,v 1.3 2009/10/21 14:15:50 rmind Exp $ */
 
 /*
  * Machine dependant startup code for OMAP boards.
@@ -43,12 +43,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 41abe19e89d4 -r 5adb630c7ed6 sys/arch/arm/xscale/ixp425.c
--- a/sys/arch/arm/xscale/ixp425.c      Wed Oct 21 13:56:36 2009 +0000
+++ b/sys/arch/arm/xscale/ixp425.c      Wed Oct 21 14:15:50 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ixp425.c,v 1.12 2009/03/17 00:51:27 msaitoh Exp $ */
+/*     $NetBSD: ixp425.c,v 1.13 2009/10/21 14:15:50 rmind Exp $ */
 
 /*
  * Copyright (c) 2003
@@ -13,12 +13,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



Home | Main Index | Thread Index | Old Index