diff options
author | marius <marius@FreeBSD.org> | 2011-03-12 14:33:32 +0000 |
---|---|---|
committer | marius <marius@FreeBSD.org> | 2011-03-12 14:33:32 +0000 |
commit | 36a5b1834f2b1e793dd9713af5e5ea9128dcf34f (patch) | |
tree | 07caa9c823676a86b78701b99241b7e3f4f720d9 /sys/sparc64/ebus | |
parent | 1f59cd375fb5ab70d433a2ee75105a1b74d54296 (diff) | |
download | FreeBSD-src-36a5b1834f2b1e793dd9713af5e5ea9128dcf34f.zip FreeBSD-src-36a5b1834f2b1e793dd9713af5e5ea9128dcf34f.tar.gz |
Sync licenses and the corresponding RCS IDs with NetBSD, mainly switching
the licenses of Matthew R. Green and the TNF to 2-clause.
Obtained from: NetBSD
Diffstat (limited to 'sys/sparc64/ebus')
-rw-r--r-- | sys/sparc64/ebus/ebus.c | 30 | ||||
-rw-r--r-- | sys/sparc64/ebus/ebusreg.h | 4 |
2 files changed, 29 insertions, 5 deletions
diff --git a/sys/sparc64/ebus/ebus.c b/sys/sparc64/ebus/ebus.c index 5f41ac1..317cdfa 100644 --- a/sys/sparc64/ebus/ebus.c +++ b/sys/sparc64/ebus/ebus.c @@ -1,6 +1,5 @@ /*- * Copyright (c) 1999, 2000 Matthew R. Green - * Copyright (c) 2001 Thomas Moestl <tmm@FreeBSD.org> * Copyright (c) 2009 by Marius Strobl <marius@FreeBSD.org> * All rights reserved. * @@ -27,7 +26,34 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * from: NetBSD: ebus.c,v 1.26 2001/09/10 16:27:53 eeh Exp + * from: NetBSD: ebus.c,v 1.52 2008/05/29 14:51:26 mrg Exp + */ +/*- + * Copyright (c) 2001 Thomas Moestl <tmm@FreeBSD.org> + * All rights reserved. + * + * 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. 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 + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR 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. */ #include <sys/cdefs.h> diff --git a/sys/sparc64/ebus/ebusreg.h b/sys/sparc64/ebus/ebusreg.h index fd192e6..0e60692 100644 --- a/sys/sparc64/ebus/ebusreg.h +++ b/sys/sparc64/ebus/ebusreg.h @@ -1,6 +1,6 @@ /* $FreeBSD$ */ /* $OpenBSD: ebusreg.h,v 1.4 2001/10/01 18:08:04 jason Exp $ */ -/* $NetBSD: ebusreg.h,v 1.1 1999/06/04 13:29:13 mrg Exp $ */ +/* $NetBSD: ebusreg.h,v 1.8 2008/05/29 14:51:27 mrg Exp $ */ /*- * Copyright (c) 1999 Matthew R. Green @@ -14,8 +14,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 WARRANTIES |