Module Name: src
Committed By: martin
Date: Sun Dec 8 14:43:16 UTC 2019
Modified Files:
src/sys/arch/emips/ebus [netbsd-9]: ace_ebus.c flash_ebus.c
Log Message:
Pull up following revision(s) (requested by bouyer in ticket #517):
sys/arch/emips/ebus/flash_ebus.c: revision 1.21
sys/arch/emips/ebus/ace_ebus.c: revision 1.21
Drop advertisement clause from my licenses
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.20.20.1 src/sys/arch/emips/ebus/ace_ebus.c
cvs rdiff -u -r1.20 -r1.20.8.1 src/sys/arch/emips/ebus/flash_ebus.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/emips/ebus/ace_ebus.c
diff -u src/sys/arch/emips/ebus/ace_ebus.c:1.20 src/sys/arch/emips/ebus/ace_ebus.c:1.20.20.1
--- src/sys/arch/emips/ebus/ace_ebus.c:1.20 Sun Nov 20 03:30:11 2016
+++ src/sys/arch/emips/ebus/ace_ebus.c Sun Dec 8 14:43:16 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ace_ebus.c,v 1.20 2016/11/20 03:30:11 pgoyette Exp $ */
+/* $NetBSD: ace_ebus.c,v 1.20.20.1 2019/12/08 14:43:16 martin Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ace_ebus.c,v 1.20 2016/11/20 03:30:11 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ace_ebus.c,v 1.20.20.1 2019/12/08 14:43:16 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1473,11 +1473,6 @@ sysace_send_config(struct ace_softc *sc,
* 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 Manuel Bouyer.
- * 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/emips/ebus/flash_ebus.c
diff -u src/sys/arch/emips/ebus/flash_ebus.c:1.20 src/sys/arch/emips/ebus/flash_ebus.c:1.20.8.1
--- src/sys/arch/emips/ebus/flash_ebus.c:1.20 Sun Mar 4 21:41:48 2018
+++ src/sys/arch/emips/ebus/flash_ebus.c Sun Dec 8 14:43:16 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: flash_ebus.c,v 1.20 2018/03/04 21:41:48 mrg Exp $ */
+/* $NetBSD: flash_ebus.c,v 1.20.8.1 2019/12/08 14:43:16 martin Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: flash_ebus.c,v 1.20 2018/03/04 21:41:48 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: flash_ebus.c,v 1.20.8.1 2019/12/08 14:43:16 martin Exp $");
/* Driver for the Intel 28F320/640/128 (J3A150) StrataFlash memory device
* Extended to include the Intel JS28F256P30T95.
@@ -1313,11 +1313,6 @@ static int eflash_write_at (struct eflas
* 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 Manuel Bouyer.
- * 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
