Module Name: src
Committed By: snj
Date: Tue Dec 15 22:17:12 UTC 2009
Modified Files:
src/sys/arch/amd64/amd64: rbus_machdep.c
src/sys/arch/amd64/include: rbus_machdep.h
src/sys/arch/i386/i386: rbus_machdep.c
src/sys/arch/i386/include: rbus_machdep.h
src/sys/arch/i386/pci: ali1543.c
src/sys/dev/cardbus: cardbus.c cardbus_map.c cardbusreg.h cardbusvar.h
cardslot.c cardslotvar.h if_ex_cardbus.c rbus.c rbus.h
src/sys/dev/pci: pccbb.c pccbbreg.h pccbbvar.h
Log Message:
Move to 2-clause license. Approved by HAYAKAWA Koichi (copyright holder).
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/amd64/amd64/rbus_machdep.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/amd64/include/rbus_machdep.h
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/i386/i386/rbus_machdep.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/i386/include/rbus_machdep.h
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/i386/pci/ali1543.c
cvs rdiff -u -r1.97 -r1.98 src/sys/dev/cardbus/cardbus.c
cvs rdiff -u -r1.30 -r1.31 src/sys/dev/cardbus/cardbus_map.c
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/cardbus/cardbusreg.h
cvs rdiff -u -r1.43 -r1.44 src/sys/dev/cardbus/cardbusvar.h
cvs rdiff -u -r1.50 -r1.51 src/sys/dev/cardbus/cardslot.c
cvs rdiff -u -r1.15 -r1.16 src/sys/dev/cardbus/cardslotvar.h
cvs rdiff -u -r1.45 -r1.46 src/sys/dev/cardbus/if_ex_cardbus.c
cvs rdiff -u -r1.27 -r1.28 src/sys/dev/cardbus/rbus.c
cvs rdiff -u -r1.10 -r1.11 src/sys/dev/cardbus/rbus.h
cvs rdiff -u -r1.191 -r1.192 src/sys/dev/pci/pccbb.c
cvs rdiff -u -r1.14 -r1.15 src/sys/dev/pci/pccbbreg.h
cvs rdiff -u -r1.38 -r1.39 src/sys/dev/pci/pccbbvar.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/amd64/amd64/rbus_machdep.c
diff -u src/sys/arch/amd64/amd64/rbus_machdep.c:1.2 src/sys/arch/amd64/amd64/rbus_machdep.c:1.3
--- src/sys/arch/amd64/amd64/rbus_machdep.c:1.2 Sun May 18 02:06:14 2008
+++ src/sys/arch/amd64/amd64/rbus_machdep.c Tue Dec 15 22:17:12 2009
@@ -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"
Index: src/sys/arch/amd64/include/rbus_machdep.h
diff -u src/sys/arch/amd64/include/rbus_machdep.h:1.1 src/sys/arch/amd64/include/rbus_machdep.h:1.2
--- src/sys/arch/amd64/include/rbus_machdep.h:1.1 Wed Dec 21 22:35:41 2005
+++ src/sys/arch/amd64/include/rbus_machdep.h Tue Dec 15 22:17:12 2009
@@ -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_
Index: src/sys/arch/i386/i386/rbus_machdep.c
diff -u src/sys/arch/i386/i386/rbus_machdep.c:1.23 src/sys/arch/i386/i386/rbus_machdep.c:1.24
--- src/sys/arch/i386/i386/rbus_machdep.c:1.23 Sun May 18 02:06:14 2008
+++ src/sys/arch/i386/i386/rbus_machdep.c Tue Dec 15 22:17:12 2009
@@ -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"
Index: src/sys/arch/i386/include/rbus_machdep.h
diff -u src/sys/arch/i386/include/rbus_machdep.h:1.7 src/sys/arch/i386/include/rbus_machdep.h:1.8
--- src/sys/arch/i386/include/rbus_machdep.h:1.7 Fri Jan 12 20:34:09 2007
+++ src/sys/arch/i386/include/rbus_machdep.h Tue Dec 15 22:17:12 2009
@@ -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_
Index: src/sys/arch/i386/pci/ali1543.c
diff -u src/sys/arch/i386/pci/ali1543.c:1.10 src/sys/arch/i386/pci/ali1543.c:1.11
--- src/sys/arch/i386/pci/ali1543.c:1.10 Mon Apr 28 20:23:24 2008
+++ src/sys/arch/i386/pci/ali1543.c Tue Dec 15 22:17:12 2009
@@ -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>
Index: src/sys/dev/cardbus/cardbus.c
diff -u src/sys/dev/cardbus/cardbus.c:1.97 src/sys/dev/cardbus/cardbus.c:1.98
--- src/sys/dev/cardbus/cardbus.c:1.97 Tue May 12 12:11:17 2009
+++ src/sys/dev/cardbus/cardbus.c Tue Dec 15 22:17:12 2009
@@ -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"
Index: src/sys/dev/cardbus/cardbus_map.c
diff -u src/sys/dev/cardbus/cardbus_map.c:1.30 src/sys/dev/cardbus/cardbus_map.c:1.31
--- src/sys/dev/cardbus/cardbus_map.c:1.30 Sun Mar 15 15:45:01 2009
+++ src/sys/dev/cardbus/cardbus_map.c Tue Dec 15 22:17:12 2009
@@ -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>
Index: src/sys/dev/cardbus/cardbusreg.h
diff -u src/sys/dev/cardbus/cardbusreg.h:1.2 src/sys/dev/cardbus/cardbusreg.h:1.3
--- src/sys/dev/cardbus/cardbusreg.h:1.2 Thu Aug 30 02:39:11 2007
+++ src/sys/dev/cardbus/cardbusreg.h Tue Dec 15 22:17:12 2009
@@ -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
Index: src/sys/dev/cardbus/cardbusvar.h
diff -u src/sys/dev/cardbus/cardbusvar.h:1.43 src/sys/dev/cardbus/cardbusvar.h:1.44
--- src/sys/dev/cardbus/cardbusvar.h:1.43 Thu Jun 26 12:33:17 2008
+++ src/sys/dev/cardbus/cardbusvar.h Tue Dec 15 22:17:12 2009
@@ -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
Index: src/sys/dev/cardbus/cardslot.c
diff -u src/sys/dev/cardbus/cardslot.c:1.50 src/sys/dev/cardbus/cardslot.c:1.51
--- src/sys/dev/cardbus/cardslot.c:1.50 Thu May 21 17:32:32 2009
+++ src/sys/dev/cardbus/cardslot.c Tue Dec 15 22:17:12 2009
@@ -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"
Index: src/sys/dev/cardbus/cardslotvar.h
diff -u src/sys/dev/cardbus/cardslotvar.h:1.15 src/sys/dev/cardbus/cardslotvar.h:1.16
--- src/sys/dev/cardbus/cardslotvar.h:1.15 Thu Jul 3 18:57:52 2008
+++ src/sys/dev/cardbus/cardslotvar.h Tue Dec 15 22:17:12 2009
@@ -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.
- *
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
Index: src/sys/dev/cardbus/if_ex_cardbus.c
diff -u src/sys/dev/cardbus/if_ex_cardbus.c:1.45 src/sys/dev/cardbus/if_ex_cardbus.c:1.46
--- src/sys/dev/cardbus/if_ex_cardbus.c:1.45 Tue Jun 24 19:44:52 2008
+++ src/sys/dev/cardbus/if_ex_cardbus.c Tue Dec 15 22:17:12 2009
@@ -1,8 +1,6 @@
-/* $NetBSD: if_ex_cardbus.c,v 1.45 2008/06/24 19:44:52 drochner Exp $ */
+/* $NetBSD: if_ex_cardbus.c,v 1.46 2009/12/15 22:17:12 snj Exp $ */
/*
- * CardBus specific routines for 3Com 3C575-family CardBus ethernet adapter
- *
* Copyright (c) 1998 and 1999
* HAYAKAWA Koichi. All rights reserved.
*
@@ -14,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. 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 HAYAKAWA KOICHI ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
@@ -32,12 +24,14 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
- *
- *
+ */
+
+/*
+ * CardBus specific routines for 3Com 3C575-family CardBus ethernet adapter
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ex_cardbus.c,v 1.45 2008/06/24 19:44:52 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ex_cardbus.c,v 1.46 2009/12/15 22:17:12 snj Exp $");
/* #define EX_DEBUG 4 */ /* define to report information for debugging */
Index: src/sys/dev/cardbus/rbus.c
diff -u src/sys/dev/cardbus/rbus.c:1.27 src/sys/dev/cardbus/rbus.c:1.28
--- src/sys/dev/cardbus/rbus.c:1.27 Sat Mar 14 21:04:19 2009
+++ src/sys/dev/cardbus/rbus.c Tue Dec 15 22:17:12 2009
@@ -1,4 +1,5 @@
-/* $NetBSD: rbus.c,v 1.27 2009/03/14 21:04:19 dsl Exp $ */
+/* $NetBSD: rbus.c,v 1.28 2009/12/15 22:17:12 snj Exp $ */
+
/*
* Copyright (c) 1999 and 2000
* HAYAKAWA Koichi. All rights reserved.
@@ -11,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 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rbus.c,v 1.27 2009/03/14 21:04:19 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rbus.c,v 1.28 2009/12/15 22:17:12 snj Exp $");
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/dev/cardbus/rbus.h
diff -u src/sys/dev/cardbus/rbus.h:1.10 src/sys/dev/cardbus/rbus.h:1.11
--- src/sys/dev/cardbus/rbus.h:1.10 Fri Oct 19 11:59:40 2007
+++ src/sys/dev/cardbus/rbus.h Tue Dec 15 22:17:12 2009
@@ -1,4 +1,5 @@
-/* $NetBSD: rbus.h,v 1.10 2007/10/19 11:59:40 ad Exp $ */
+/* $NetBSD: rbus.h,v 1.11 2009/12/15 22:17:12 snj Exp $ */
+
/*
* Copyright (c) 1999
* HAYAKAWA Koichi. All rights reserved.
@@ -11,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
Index: src/sys/dev/pci/pccbb.c
diff -u src/sys/dev/pci/pccbb.c:1.191 src/sys/dev/pci/pccbb.c:1.192
--- src/sys/dev/pci/pccbb.c:1.191 Fri Aug 7 12:09:50 2009
+++ src/sys/dev/pci/pccbb.c Tue Dec 15 22:17:12 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: pccbb.c,v 1.191 2009/08/07 12:09:50 blymn Exp $ */
+/* $NetBSD: pccbb.c,v 1.192 2009/12/15 22:17:12 snj Exp $ */
/*
* Copyright (c) 1998, 1999 and 2000
@@ -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: pccbb.c,v 1.191 2009/08/07 12:09:50 blymn Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pccbb.c,v 1.192 2009/12/15 22:17:12 snj Exp $");
/*
#define CBB_DEBUG
Index: src/sys/dev/pci/pccbbreg.h
diff -u src/sys/dev/pci/pccbbreg.h:1.14 src/sys/dev/pci/pccbbreg.h:1.15
--- src/sys/dev/pci/pccbbreg.h:1.14 Thu Jul 3 13:37:35 2008
+++ src/sys/dev/pci/pccbbreg.h Tue Dec 15 22:17:12 2009
@@ -1,4 +1,5 @@
-/* $NetBSD: pccbbreg.h,v 1.14 2008/07/03 13:37:35 drochner Exp $ */
+/* $NetBSD: pccbbreg.h,v 1.15 2009/12/15 22:17:12 snj Exp $ */
+
/*
* Copyright (c) 1999 HAYAKAWA Koichi. All rights reserved.
*
@@ -10,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 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
@@ -28,7 +24,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-
#ifndef _DEV_PCI_PCCBBREG_H_
#define _DEV_PCI_PCCBBREG_H_
Index: src/sys/dev/pci/pccbbvar.h
diff -u src/sys/dev/pci/pccbbvar.h:1.38 src/sys/dev/pci/pccbbvar.h:1.39
--- src/sys/dev/pci/pccbbvar.h:1.38 Thu Jul 23 21:22:25 2009
+++ src/sys/dev/pci/pccbbvar.h Tue Dec 15 22:17:12 2009
@@ -1,4 +1,5 @@
-/* $NetBSD: pccbbvar.h,v 1.38 2009/07/23 21:22:25 dyoung Exp $ */
+/* $NetBSD: pccbbvar.h,v 1.39 2009/12/15 22:17:12 snj Exp $ */
+
/*
* Copyright (c) 1999 HAYAKAWA Koichi. All rights reserved.
*
@@ -10,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 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
