Module Name:    src
Committed By:   snj
Date:           Fri Oct 23 00:39:31 UTC 2009

Modified Files:
        src/sys/arch/arm/at91: at91_bus_dma.c
        src/sys/arch/arm/ep93xx: ep93xx_busdma.c ep93xx_intr.h ep93xx_space.c
            ep93xxreg.h ep93xxvar.h epclk.c epclkreg.h epcomreg.h epcomvar.h
            epe.c epereg.h epevar.h epsoc.c epsocvar.h
        src/sys/arch/evbarm/stand/board: epcom.c ts7200.c
        src/sys/arch/evbarm/tsarm: tsarmreg.h tspld.c
        src/sys/dev/isa: tsdioreg.h tsdiovar.h

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


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/at91/at91_bus_dma.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/ep93xx/ep93xx_busdma.c \
    src/sys/arch/arm/ep93xx/ep93xxvar.h src/sys/arch/arm/ep93xx/epclkreg.h \
    src/sys/arch/arm/ep93xx/epcomreg.h src/sys/arch/arm/ep93xx/epsocvar.h
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/ep93xx/ep93xx_intr.h \
    src/sys/arch/arm/ep93xx/epevar.h
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/ep93xx/ep93xx_space.c \
    src/sys/arch/arm/ep93xx/epcomvar.h src/sys/arch/arm/ep93xx/epereg.h
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/ep93xx/ep93xxreg.h
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/arm/ep93xx/epclk.c
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/arm/ep93xx/epe.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arm/ep93xx/epsoc.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/stand/board/epcom.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbarm/stand/board/ts7200.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbarm/tsarm/tsarmreg.h
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/evbarm/tsarm/tspld.c
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/isa/tsdioreg.h \
    src/sys/dev/isa/tsdiovar.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/arm/at91/at91_bus_dma.c
diff -u src/sys/arch/arm/at91/at91_bus_dma.c:1.2 src/sys/arch/arm/at91/at91_bus_dma.c:1.3
--- src/sys/arch/arm/at91/at91_bus_dma.c:1.2	Thu Jul  3 01:15:38 2008
+++ src/sys/arch/arm/at91/at91_bus_dma.c	Fri Oct 23 00:39:29 2009
@@ -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>

Index: src/sys/arch/arm/ep93xx/ep93xx_busdma.c
diff -u src/sys/arch/arm/ep93xx/ep93xx_busdma.c:1.2 src/sys/arch/arm/ep93xx/ep93xx_busdma.c:1.3
--- src/sys/arch/arm/ep93xx/ep93xx_busdma.c:1.2	Sun Dec 11 12:16:45 2005
+++ src/sys/arch/arm/ep93xx/ep93xx_busdma.c	Fri Oct 23 00:39:30 2009
@@ -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>
Index: src/sys/arch/arm/ep93xx/ep93xxvar.h
diff -u src/sys/arch/arm/ep93xx/ep93xxvar.h:1.2 src/sys/arch/arm/ep93xx/ep93xxvar.h:1.3
--- src/sys/arch/arm/ep93xx/ep93xxvar.h:1.2	Sun Dec 11 12:16:45 2005
+++ src/sys/arch/arm/ep93xx/ep93xxvar.h	Fri Oct 23 00:39:30 2009
@@ -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
Index: src/sys/arch/arm/ep93xx/epclkreg.h
diff -u src/sys/arch/arm/ep93xx/epclkreg.h:1.2 src/sys/arch/arm/ep93xx/epclkreg.h:1.3
--- src/sys/arch/arm/ep93xx/epclkreg.h:1.2	Sat Nov 12 05:33:23 2005
+++ src/sys/arch/arm/ep93xx/epclkreg.h	Fri Oct 23 00:39:30 2009
@@ -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
Index: src/sys/arch/arm/ep93xx/epcomreg.h
diff -u src/sys/arch/arm/ep93xx/epcomreg.h:1.2 src/sys/arch/arm/ep93xx/epcomreg.h:1.3
--- src/sys/arch/arm/ep93xx/epcomreg.h:1.2	Sun Dec 11 12:16:45 2005
+++ src/sys/arch/arm/ep93xx/epcomreg.h	Fri Oct 23 00:39:30 2009
@@ -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
Index: src/sys/arch/arm/ep93xx/epsocvar.h
diff -u src/sys/arch/arm/ep93xx/epsocvar.h:1.2 src/sys/arch/arm/ep93xx/epsocvar.h:1.3
--- src/sys/arch/arm/ep93xx/epsocvar.h:1.2	Sat Nov 12 05:33:23 2005
+++ src/sys/arch/arm/ep93xx/epsocvar.h	Fri Oct 23 00:39:30 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: epsocvar.h,v 1.2 2005/11/12 05:33:23 hamajima Exp $ */
+/*	$NetBSD: epsocvar.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

Index: src/sys/arch/arm/ep93xx/ep93xx_intr.h
diff -u src/sys/arch/arm/ep93xx/ep93xx_intr.h:1.4 src/sys/arch/arm/ep93xx/ep93xx_intr.h:1.5
--- src/sys/arch/arm/ep93xx/ep93xx_intr.h:1.4	Sun Apr 27 18:58:44 2008
+++ src/sys/arch/arm/ep93xx/ep93xx_intr.h	Fri Oct 23 00:39:30 2009
@@ -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
Index: src/sys/arch/arm/ep93xx/epevar.h
diff -u src/sys/arch/arm/ep93xx/epevar.h:1.4 src/sys/arch/arm/ep93xx/epevar.h:1.5
--- src/sys/arch/arm/ep93xx/epevar.h:1.4	Sun Mar  4 05:59:37 2007
+++ src/sys/arch/arm/ep93xx/epevar.h	Fri Oct 23 00:39:30 2009
@@ -1,4 +1,4 @@
-/*      $NetBSD: epevar.h,v 1.4 2007/03/04 05:59:37 christos Exp $        */
+/*      $NetBSD: epevar.h,v 1.5 2009/10/23 00:39:30 snj Exp $        */
 /*-
  * Copyright (c) 2004 Jesse Off
  * All rights reserved
@@ -11,13 +11,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

Index: src/sys/arch/arm/ep93xx/ep93xx_space.c
diff -u src/sys/arch/arm/ep93xx/ep93xx_space.c:1.3 src/sys/arch/arm/ep93xx/ep93xx_space.c:1.4
--- src/sys/arch/arm/ep93xx/ep93xx_space.c:1.3	Thu Nov 24 13:08:32 2005
+++ src/sys/arch/arm/ep93xx/ep93xx_space.c	Fri Oct 23 00:39:30 2009
@@ -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
Index: src/sys/arch/arm/ep93xx/epcomvar.h
diff -u src/sys/arch/arm/ep93xx/epcomvar.h:1.3 src/sys/arch/arm/ep93xx/epcomvar.h:1.4
--- src/sys/arch/arm/ep93xx/epcomvar.h:1.3	Sun Dec 11 12:16:45 2005
+++ src/sys/arch/arm/ep93xx/epcomvar.h	Fri Oct 23 00:39:30 2009
@@ -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
Index: src/sys/arch/arm/ep93xx/epereg.h
diff -u src/sys/arch/arm/ep93xx/epereg.h:1.3 src/sys/arch/arm/ep93xx/epereg.h:1.4
--- src/sys/arch/arm/ep93xx/epereg.h:1.3	Sun Dec 11 12:16:45 2005
+++ src/sys/arch/arm/ep93xx/epereg.h	Fri Oct 23 00:39:30 2009
@@ -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
- *    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

Index: src/sys/arch/arm/ep93xx/ep93xxreg.h
diff -u src/sys/arch/arm/ep93xx/ep93xxreg.h:1.6 src/sys/arch/arm/ep93xx/ep93xxreg.h:1.7
--- src/sys/arch/arm/ep93xx/ep93xxreg.h:1.6	Mon Feb 13 12:13:20 2006
+++ src/sys/arch/arm/ep93xx/ep93xxreg.h	Fri Oct 23 00:39:30 2009
@@ -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

Index: src/sys/arch/arm/ep93xx/epclk.c
diff -u src/sys/arch/arm/ep93xx/epclk.c:1.16 src/sys/arch/arm/ep93xx/epclk.c:1.17
--- src/sys/arch/arm/ep93xx/epclk.c:1.16	Fri Dec 19 04:26:35 2008
+++ src/sys/arch/arm/ep93xx/epclk.c	Fri Oct 23 00:39:30 2009
@@ -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>

Index: src/sys/arch/arm/ep93xx/epe.c
diff -u src/sys/arch/arm/ep93xx/epe.c:1.21 src/sys/arch/arm/ep93xx/epe.c:1.22
--- src/sys/arch/arm/ep93xx/epe.c:1.21	Wed Mar 18 16:00:09 2009
+++ src/sys/arch/arm/ep93xx/epe.c	Fri Oct 23 00:39:30 2009
@@ -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>

Index: src/sys/arch/arm/ep93xx/epsoc.c
diff -u src/sys/arch/arm/ep93xx/epsoc.c:1.9 src/sys/arch/arm/ep93xx/epsoc.c:1.10
--- src/sys/arch/arm/ep93xx/epsoc.c:1.9	Sat Mar 14 15:36:01 2009
+++ src/sys/arch/arm/ep93xx/epsoc.c	Fri Oct 23 00:39:30 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: epsoc.c,v 1.9 2009/03/14 15:36:01 dsl Exp $	*/
+/*	$NetBSD: epsoc.c,v 1.10 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: epsoc.c,v 1.9 2009/03/14 15:36:01 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: epsoc.c,v 1.10 2009/10/23 00:39:30 snj Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>

Index: src/sys/arch/evbarm/stand/board/epcom.c
diff -u src/sys/arch/evbarm/stand/board/epcom.c:1.4 src/sys/arch/evbarm/stand/board/epcom.c:1.5
--- src/sys/arch/evbarm/stand/board/epcom.c:1.4	Wed Mar  8 23:46:23 2006
+++ src/sys/arch/evbarm/stand/board/epcom.c	Fri Oct 23 00:39:30 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: epcom.c,v 1.4 2006/03/08 23:46:23 lukem Exp $	*/
+/*	$NetBSD: epcom.c,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

Index: src/sys/arch/evbarm/stand/board/ts7200.c
diff -u src/sys/arch/evbarm/stand/board/ts7200.c:1.3 src/sys/arch/evbarm/stand/board/ts7200.c:1.4
--- src/sys/arch/evbarm/stand/board/ts7200.c:1.3	Mon Jan 16 19:34:53 2006
+++ src/sys/arch/evbarm/stand/board/ts7200.c	Fri Oct 23 00:39:30 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: ts7200.c,v 1.3 2006/01/16 19:34:53 he Exp $	*/
+/*	$NetBSD: ts7200.c,v 1.4 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

Index: src/sys/arch/evbarm/tsarm/tsarmreg.h
diff -u src/sys/arch/evbarm/tsarm/tsarmreg.h:1.5 src/sys/arch/evbarm/tsarm/tsarmreg.h:1.6
--- src/sys/arch/evbarm/tsarm/tsarmreg.h:1.5	Sun Dec 11 12:17:11 2005
+++ src/sys/arch/evbarm/tsarm/tsarmreg.h	Fri Oct 23 00:39:31 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: tsarmreg.h,v 1.5 2005/12/11 12:17:11 christos Exp $	*/
+/*	$NetBSD: tsarmreg.h,v 1.6 2009/10/23 00:39:31 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

Index: src/sys/arch/evbarm/tsarm/tspld.c
diff -u src/sys/arch/evbarm/tsarm/tspld.c:1.19 src/sys/arch/evbarm/tsarm/tspld.c:1.20
--- src/sys/arch/evbarm/tsarm/tspld.c:1.19	Sat Mar 14 21:04:08 2009
+++ src/sys/arch/evbarm/tsarm/tspld.c	Fri Oct 23 00:39:31 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: tspld.c,v 1.19 2009/03/14 21:04:08 dsl Exp $	*/
+/*	$NetBSD: tspld.c,v 1.20 2009/10/23 00:39:31 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
@@ -35,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tspld.c,v 1.19 2009/03/14 21:04:08 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tspld.c,v 1.20 2009/10/23 00:39:31 snj Exp $");
 
 #include <sys/param.h>
 #include <sys/callout.h>

Index: src/sys/dev/isa/tsdioreg.h
diff -u src/sys/dev/isa/tsdioreg.h:1.2 src/sys/dev/isa/tsdioreg.h:1.3
--- src/sys/dev/isa/tsdioreg.h:1.2	Sun Dec 11 12:22:03 2005
+++ src/sys/dev/isa/tsdioreg.h	Fri Oct 23 00:39:31 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: tsdioreg.h,v 1.2 2005/12/11 12:22:03 christos Exp $	*/
+/*	$NetBSD: tsdioreg.h,v 1.3 2009/10/23 00:39:31 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
Index: src/sys/dev/isa/tsdiovar.h
diff -u src/sys/dev/isa/tsdiovar.h:1.2 src/sys/dev/isa/tsdiovar.h:1.3
--- src/sys/dev/isa/tsdiovar.h:1.2	Sun Dec 11 12:22:03 2005
+++ src/sys/dev/isa/tsdiovar.h	Fri Oct 23 00:39:31 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: tsdiovar.h,v 1.2 2005/12/11 12:22:03 christos Exp $	*/
+/*	$NetBSD: tsdiovar.h,v 1.3 2009/10/23 00:39:31 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

Reply via email to