Replace TNF licenses with standard 2 clause variant.

This commit is contained in:
martin 2008-05-02 22:00:29 +00:00
parent 84a064c56f
commit 04bdb2ab99
2 changed files with 29 additions and 19 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: imx31_ahb.c,v 1.2 2008/04/27 18:58:44 matt Exp $ */ /* $NetBSD: imx31_ahb.c,v 1.3 2008/05/02 22:00:29 martin Exp $ */
/* /*
* Copyright (c) 2002, 2005 Genetec Corporation. All rights reserved. * Copyright (c) 2002, 2005 Genetec Corporation. All rights reserved.
@ -51,13 +51,18 @@
* 2. Redistributions in binary form must reproduce the above copyright * 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the * notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution. * 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 SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
* This product includes software developed by the NetBSD * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
* Foundation, Inc. and its contributors. * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
* 4. Neither the name of The NetBSD Foundation nor the names of its * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
* contributors may be used to endorse or promote products derived * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* from this software without specific prior written permission. * 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.
*/ */
/*- /*-
* Copyright (c) 1999 * Copyright (c) 1999
@ -94,7 +99,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$Id: imx31_ahb.c,v 1.2 2008/04/27 18:58:44 matt Exp $"); __KERNEL_RCSID(0, "$Id: imx31_ahb.c,v 1.3 2008/05/02 22:00:29 martin Exp $");
#include "locators.h" #include "locators.h"
#include "avic.h" #include "avic.h"

View File

@ -1,7 +1,7 @@
/* $Id: imx31_aips.c,v 1.2 2008/04/27 18:58:44 matt Exp $ */ /* $Id: imx31_aips.c,v 1.3 2008/05/02 22:00:29 martin Exp $ */
/* derived from: */ /* derived from: */
/* $NetBSD: imx31_aips.c,v 1.2 2008/04/27 18:58:44 matt Exp $ */ /* $NetBSD: imx31_aips.c,v 1.3 2008/05/02 22:00:29 martin Exp $ */
/* /*
* Copyright (c) 2002, 2005 Genetec Corporation. All rights reserved. * Copyright (c) 2002, 2005 Genetec Corporation. All rights reserved.
@ -54,13 +54,18 @@
* 2. Redistributions in binary form must reproduce the above copyright * 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the * notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution. * 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 SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
* This product includes software developed by the NetBSD * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
* Foundation, Inc. and its contributors. * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
* 4. Neither the name of The NetBSD Foundation nor the names of its * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
* contributors may be used to endorse or promote products derived * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* from this software without specific prior written permission. * 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.
*/ */
/*- /*-
* Copyright (c) 1999 * Copyright (c) 1999
@ -97,7 +102,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$Id: imx31_aips.c,v 1.2 2008/04/27 18:58:44 matt Exp $"); __KERNEL_RCSID(0, "$Id: imx31_aips.c,v 1.3 2008/05/02 22:00:29 martin Exp $");
#include "locators.h" #include "locators.h"