[src/netbsd-9]: src/sys/arch/emips/ebus Pull up following revision(s) (reques...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/637900341f7a
branches:  netbsd-9
changeset: 465986:637900341f7a
user:      martin <martin%NetBSD.org@localhost>
date:      Sun Dec 08 14:43:16 2019 +0000

description:
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

diffstat:

 sys/arch/emips/ebus/ace_ebus.c   |  9 ++-------
 sys/arch/emips/ebus/flash_ebus.c |  9 ++-------
 2 files changed, 4 insertions(+), 14 deletions(-)

diffs (60 lines):

diff -r 3dc0e061f3ba -r 637900341f7a sys/arch/emips/ebus/ace_ebus.c
--- a/sys/arch/emips/ebus/ace_ebus.c    Sun Dec 08 14:42:01 2019 +0000
+++ b/sys/arch/emips/ebus/ace_ebus.c    Sun Dec 08 14:43:16 2019 +0000
@@ -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 @@
  * 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
diff -r 3dc0e061f3ba -r 637900341f7a sys/arch/emips/ebus/flash_ebus.c
--- a/sys/arch/emips/ebus/flash_ebus.c  Sun Dec 08 14:42:01 2019 +0000
+++ b/sys/arch/emips/ebus/flash_ebus.c  Sun Dec 08 14:43:16 2019 +0000
@@ -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 @@
  * 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