[src/trunk]: src/sys UCB no longer requires the advertising clause.

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

details:   https://anonhg.NetBSD.org/src/rev/55f545230bd3
branches:  trunk
changeset: 559881:55f545230bd3
user:      is <is%NetBSD.org@localhost>
date:      Thu Mar 25 10:53:46 2004 +0000

description:
UCB no longer requires the advertising clause.

diffstat:

 sys/arch/amiga/dev/drsc.c |  41 ++++-------------------------------------
 sys/net/if_arcsubr.c      |  41 +++--------------------------------------
 2 files changed, 7 insertions(+), 75 deletions(-)

diffs (116 lines):

diff -r ecff7160b6af -r 55f545230bd3 sys/arch/amiga/dev/drsc.c
--- a/sys/arch/amiga/dev/drsc.c Thu Mar 25 10:20:27 2004 +0000
+++ b/sys/arch/amiga/dev/drsc.c Thu Mar 25 10:53:46 2004 +0000
@@ -1,6 +1,8 @@
-/*     $NetBSD: drsc.c,v 1.24 2003/08/07 16:26:40 agc Exp $ */
+/*     $NetBSD: drsc.c,v 1.25 2004/03/25 10:58:39 is Exp $ */
 
 /*
+ * Copyright (c) 1996 Ignatios Souvatzis
+ * Copyright (c) 1994 Michael L. Hitch
  * Copyright (c) 1982, 1990 The Regents of the University of California.
  * All rights reserved.
  *
@@ -31,43 +33,8 @@
  *     @(#)dma.c
  */
 
-/*
- * Copyright (c) 1996 Ignatios Souvatzis
- * Copyright (c) 1994 Michael L. Hitch
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 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 University of
- *     California, Berkeley and its contributors.
- * 4. Neither the name of the University 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
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * 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.
- *
- *     @(#)dma.c
- */
-
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drsc.c,v 1.24 2003/08/07 16:26:40 agc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drsc.c,v 1.25 2004/03/25 10:58:39 is Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff -r ecff7160b6af -r 55f545230bd3 sys/net/if_arcsubr.c
--- a/sys/net/if_arcsubr.c      Thu Mar 25 10:20:27 2004 +0000
+++ b/sys/net/if_arcsubr.c      Thu Mar 25 10:53:46 2004 +0000
@@ -1,6 +1,7 @@
-/*     $NetBSD: if_arcsubr.c,v 1.44 2003/08/11 15:13:59 itojun Exp $   */
+/*     $NetBSD: if_arcsubr.c,v 1.45 2004/03/25 10:53:46 is Exp $       */
 
 /*
+ * Copyright (c) 1994, 1995 Ignatios Souvatzis
  * Copyright (c) 1982, 1989, 1993
  *     The Regents of the University of California.  All rights reserved.
  *
@@ -33,44 +34,8 @@
  *
  */
 
-/*
- * Copyright (c) 1994, 1995 Ignatios Souvatzis
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 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 University of
- *     California, Berkeley and its contributors.
- * 4. Neither the name of the University 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
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * 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.
- *
- * from: NetBSD: if_ethersubr.c,v 1.9 1994/06/29 06:36:11 cgd Exp
- *       @(#)if_ethersubr.c    8.1 (Berkeley) 6/10/93
- *
- */
-
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_arcsubr.c,v 1.44 2003/08/11 15:13:59 itojun Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_arcsubr.c,v 1.45 2004/03/25 10:53:46 is Exp $");
 
 #include "opt_inet.h"