Module Name: src
Committed By: dbj
Date: Sat Apr 24 19:58:13 UTC 2010
Modified Files:
src/sys/arch/next68k/dev: if_xe.c if_xevar.h mb8795.c mb8795reg.h
mb8795var.h nextcons.c nextdma.c nextdmareg.h nextdmavar.h
src/sys/arch/next68k/next68k: clock.c nextrom.c nextrom.h
src/sys/ufs/ffs: ffs_appleufs.c
Log Message:
switch from 4 clause to 2 clause BSD license.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/next68k/dev/if_xe.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/next68k/dev/if_xevar.h
cvs rdiff -u -r1.48 -r1.49 src/sys/arch/next68k/dev/mb8795.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/next68k/dev/mb8795reg.h
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/next68k/dev/mb8795var.h \
src/sys/arch/next68k/dev/nextcons.c
cvs rdiff -u -r1.45 -r1.46 src/sys/arch/next68k/dev/nextdma.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/next68k/dev/nextdmareg.h
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/next68k/dev/nextdmavar.h
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/next68k/next68k/clock.c
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/next68k/next68k/nextrom.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/next68k/next68k/nextrom.h
cvs rdiff -u -r1.9 -r1.10 src/sys/ufs/ffs/ffs_appleufs.c
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/next68k/dev/if_xe.c
diff -u src/sys/arch/next68k/dev/if_xe.c:1.20 src/sys/arch/next68k/dev/if_xe.c:1.21
--- src/sys/arch/next68k/dev/if_xe.c:1.20 Tue Jan 19 22:06:22 2010
+++ src/sys/arch/next68k/dev/if_xe.c Sat Apr 24 19:58:13 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: if_xe.c,v 1.20 2010/01/19 22:06:22 pooka Exp $ */
+/* $NetBSD: if_xe.c,v 1.21 2010/04/24 19:58:13 dbj Exp $ */
/*
* Copyright (c) 1998 Darrin B. Jewell
* All rights reserved.
@@ -11,11 +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 Darrin B. Jewell
- * 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,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_xe.c,v 1.20 2010/01/19 22:06:22 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_xe.c,v 1.21 2010/04/24 19:58:13 dbj Exp $");
#include "opt_inet.h"
Index: src/sys/arch/next68k/dev/if_xevar.h
diff -u src/sys/arch/next68k/dev/if_xevar.h:1.4 src/sys/arch/next68k/dev/if_xevar.h:1.5
--- src/sys/arch/next68k/dev/if_xevar.h:1.4 Sat May 3 18:10:55 2003
+++ src/sys/arch/next68k/dev/if_xevar.h Sat Apr 24 19:58:13 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: if_xevar.h,v 1.4 2003/05/03 18:10:55 wiz Exp $ */
+/* $NetBSD: if_xevar.h,v 1.5 2010/04/24 19:58:13 dbj Exp $ */
/*
* Copyright (c) 1998 Darrin B. Jewell
* All rights reserved.
@@ -11,11 +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 Darrin B. Jewell
- * 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
Index: src/sys/arch/next68k/dev/mb8795.c
diff -u src/sys/arch/next68k/dev/mb8795.c:1.48 src/sys/arch/next68k/dev/mb8795.c:1.49
--- src/sys/arch/next68k/dev/mb8795.c:1.48 Mon Apr 5 07:19:31 2010
+++ src/sys/arch/next68k/dev/mb8795.c Sat Apr 24 19:58:13 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: mb8795.c,v 1.48 2010/04/05 07:19:31 joerg Exp $ */
+/* $NetBSD: mb8795.c,v 1.49 2010/04/24 19:58:13 dbj Exp $ */
/*
* Copyright (c) 1998 Darrin B. Jewell
* All rights reserved.
@@ -11,11 +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 Darrin B. Jewell
- * 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,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mb8795.c,v 1.48 2010/04/05 07:19:31 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mb8795.c,v 1.49 2010/04/24 19:58:13 dbj Exp $");
#include "opt_inet.h"
#include "rnd.h"
Index: src/sys/arch/next68k/dev/mb8795reg.h
diff -u src/sys/arch/next68k/dev/mb8795reg.h:1.3 src/sys/arch/next68k/dev/mb8795reg.h:1.4
--- src/sys/arch/next68k/dev/mb8795reg.h:1.3 Wed Sep 11 01:46:32 2002
+++ src/sys/arch/next68k/dev/mb8795reg.h Sat Apr 24 19:58:13 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: mb8795reg.h,v 1.3 2002/09/11 01:46:32 mycroft Exp $ */
+/* $NetBSD: mb8795reg.h,v 1.4 2010/04/24 19:58:13 dbj Exp $ */
/*
* Copyright (c) 1998 Darrin B. Jewell
* All rights reserved.
@@ -11,11 +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 Darrin B. Jewell
- * 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
Index: src/sys/arch/next68k/dev/mb8795var.h
diff -u src/sys/arch/next68k/dev/mb8795var.h:1.10 src/sys/arch/next68k/dev/mb8795var.h:1.11
--- src/sys/arch/next68k/dev/mb8795var.h:1.10 Sun Mar 4 06:00:27 2007
+++ src/sys/arch/next68k/dev/mb8795var.h Sat Apr 24 19:58:13 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: mb8795var.h,v 1.10 2007/03/04 06:00:27 christos Exp $ */
+/* $NetBSD: mb8795var.h,v 1.11 2010/04/24 19:58:13 dbj Exp $ */
/*
* Copyright (c) 1998 Darrin B. Jewell
* All rights reserved.
@@ -11,11 +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 Darrin B. Jewell
- * 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
Index: src/sys/arch/next68k/dev/nextcons.c
diff -u src/sys/arch/next68k/dev/nextcons.c:1.10 src/sys/arch/next68k/dev/nextcons.c:1.11
--- src/sys/arch/next68k/dev/nextcons.c:1.10 Sat Jan 5 00:31:55 2008
+++ src/sys/arch/next68k/dev/nextcons.c Sat Apr 24 19:58:13 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: nextcons.c,v 1.10 2008/01/05 00:31:55 ad Exp $ */
+/* $NetBSD: nextcons.c,v 1.11 2010/04/24 19:58:13 dbj Exp $ */
/*
* Copyright (c) 1999 Darrin B. Jewell
@@ -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 Darrin B. Jewell
- * 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: nextcons.c,v 1.10 2008/01/05 00:31:55 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nextcons.c,v 1.11 2010/04/24 19:58:13 dbj Exp $");
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/arch/next68k/dev/nextdma.c
diff -u src/sys/arch/next68k/dev/nextdma.c:1.45 src/sys/arch/next68k/dev/nextdma.c:1.46
--- src/sys/arch/next68k/dev/nextdma.c:1.45 Thu Nov 5 18:11:09 2009
+++ src/sys/arch/next68k/dev/nextdma.c Sat Apr 24 19:58:13 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: nextdma.c,v 1.45 2009/11/05 18:11:09 dyoung Exp $ */
+/* $NetBSD: nextdma.c,v 1.46 2010/04/24 19:58:13 dbj Exp $ */
/*
* Copyright (c) 1998 Darrin B. Jewell
* All rights reserved.
@@ -11,11 +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 Darrin B. Jewell
- * 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,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nextdma.c,v 1.45 2009/11/05 18:11:09 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nextdma.c,v 1.46 2010/04/24 19:58:13 dbj Exp $");
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/arch/next68k/dev/nextdmareg.h
diff -u src/sys/arch/next68k/dev/nextdmareg.h:1.8 src/sys/arch/next68k/dev/nextdmareg.h:1.9
--- src/sys/arch/next68k/dev/nextdmareg.h:1.8 Wed Sep 11 01:46:32 2002
+++ src/sys/arch/next68k/dev/nextdmareg.h Sat Apr 24 19:58:13 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: nextdmareg.h,v 1.8 2002/09/11 01:46:32 mycroft Exp $ */
+/* $NetBSD: nextdmareg.h,v 1.9 2010/04/24 19:58:13 dbj Exp $ */
/*
* Copyright (c) 1998 Darrin B. Jewell
* All rights reserved.
@@ -11,11 +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 Darrin B. Jewell
- * 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
Index: src/sys/arch/next68k/dev/nextdmavar.h
diff -u src/sys/arch/next68k/dev/nextdmavar.h:1.14 src/sys/arch/next68k/dev/nextdmavar.h:1.15
--- src/sys/arch/next68k/dev/nextdmavar.h:1.14 Sun Dec 11 12:18:25 2005
+++ src/sys/arch/next68k/dev/nextdmavar.h Sat Apr 24 19:58:13 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: nextdmavar.h,v 1.14 2005/12/11 12:18:25 christos Exp $ */
+/* $NetBSD: nextdmavar.h,v 1.15 2010/04/24 19:58:13 dbj Exp $ */
/*
* Copyright (c) 1998 Darrin B. Jewell
* All rights reserved.
@@ -11,11 +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 Darrin B. Jewell
- * 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
Index: src/sys/arch/next68k/next68k/clock.c
diff -u src/sys/arch/next68k/next68k/clock.c:1.11 src/sys/arch/next68k/next68k/clock.c:1.12
--- src/sys/arch/next68k/next68k/clock.c:1.11 Mon Sep 11 15:07:50 2006
+++ src/sys/arch/next68k/next68k/clock.c Sat Apr 24 19:58:13 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: clock.c,v 1.11 2006/09/11 15:07:50 gdamore Exp $ */
+/* $NetBSD: clock.c,v 1.12 2010/04/24 19:58:13 dbj Exp $ */
/*
* Copyright (c) 1998 Darrin B. Jewell
* All rights reserved.
@@ -11,11 +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 Darrin B. Jewell
- * 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,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.11 2006/09/11 15:07:50 gdamore Exp $");
+__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.12 2010/04/24 19:58:13 dbj Exp $");
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/arch/next68k/next68k/nextrom.c
diff -u src/sys/arch/next68k/next68k/nextrom.c:1.20 src/sys/arch/next68k/next68k/nextrom.c:1.21
--- src/sys/arch/next68k/next68k/nextrom.c:1.20 Sun Dec 11 12:18:29 2005
+++ src/sys/arch/next68k/next68k/nextrom.c Sat Apr 24 19:58:13 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: nextrom.c,v 1.20 2005/12/11 12:18:29 christos Exp $ */
+/* $NetBSD: nextrom.c,v 1.21 2010/04/24 19:58:13 dbj Exp $ */
/*
* Copyright (c) 1998 Darrin B. Jewell
* All rights reserved.
@@ -11,11 +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 Darrin B. Jewell
- * 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,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nextrom.c,v 1.20 2005/12/11 12:18:29 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nextrom.c,v 1.21 2010/04/24 19:58:13 dbj Exp $");
#include "opt_ddb.h"
#include "opt_serial.h"
Index: src/sys/arch/next68k/next68k/nextrom.h
diff -u src/sys/arch/next68k/next68k/nextrom.h:1.9 src/sys/arch/next68k/next68k/nextrom.h:1.10
--- src/sys/arch/next68k/next68k/nextrom.h:1.9 Sun Mar 4 06:00:27 2007
+++ src/sys/arch/next68k/next68k/nextrom.h Sat Apr 24 19:58:13 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: nextrom.h,v 1.9 2007/03/04 06:00:27 christos Exp $ */
+/* $NetBSD: nextrom.h,v 1.10 2010/04/24 19:58:13 dbj Exp $ */
/*
* Copyright (c) 1998 Darrin B. Jewell
* All rights reserved.
@@ -11,11 +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 Darrin B. Jewell
- * 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
Index: src/sys/ufs/ffs/ffs_appleufs.c
diff -u src/sys/ufs/ffs/ffs_appleufs.c:1.9 src/sys/ufs/ffs/ffs_appleufs.c:1.10
--- src/sys/ufs/ffs/ffs_appleufs.c:1.9 Sun Jun 11 09:26:04 2006
+++ src/sys/ufs/ffs/ffs_appleufs.c Sat Apr 24 19:58:13 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ffs_appleufs.c,v 1.9 2006/06/11 09:26:04 kardel Exp $ */
+/* $NetBSD: ffs_appleufs.c,v 1.10 2010/04/24 19:58:13 dbj Exp $ */
/*
* Copyright (c) 2002 Darrin B. Jewell
@@ -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 Darrin B. Jewell
- * 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: ffs_appleufs.c,v 1.9 2006/06/11 09:26:04 kardel Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ffs_appleufs.c,v 1.10 2010/04/24 19:58:13 dbj Exp $");
#include <sys/param.h>
#include <sys/time.h>
