Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/amiga/dev Only change my own license conditions.



details:   https://anonhg.NetBSD.org/src/rev/eab4259ba04c
branches:  trunk
changeset: 559882:eab4259ba04c
user:      is <is%NetBSD.org@localhost>
date:      Thu Mar 25 11:12:08 2004 +0000

description:
Only change my own license conditions.

diffstat:

 sys/arch/amiga/dev/drsc.c |  39 ++++++++++++++++++++++++++++++++++++---
 1 files changed, 36 insertions(+), 3 deletions(-)

diffs (57 lines):

diff -r 55f545230bd3 -r eab4259ba04c sys/arch/amiga/dev/drsc.c
--- a/sys/arch/amiga/dev/drsc.c Thu Mar 25 10:53:46 2004 +0000
+++ b/sys/arch/amiga/dev/drsc.c Thu Mar 25 11:12:08 2004 +0000
@@ -1,8 +1,7 @@
-/*     $NetBSD: drsc.c,v 1.25 2004/03/25 10:58:39 is Exp $ */
+/*     $NetBSD: drsc.c,v 1.26 2004/03/25 11:12:08 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.
  *
@@ -33,8 +32,42 @@
  *     @(#)dma.c
  */
 
+/*
+ * 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.25 2004/03/25 10:58:39 is Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drsc.c,v 1.26 2004/03/25 11:12:08 is Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>



Home | Main Index | Thread Index | Old Index