diff --git a/sys/arch/powerpc/pci/pcib.c b/sys/arch/powerpc/pci/pcib.c index 093048062e56..b8c3b9f21c14 100644 --- a/sys/arch/powerpc/pci/pcib.c +++ b/sys/arch/powerpc/pci/pcib.c @@ -1,4 +1,4 @@ -/* $NetBSD: pcib.c,v 1.4 2008/04/04 16:04:19 matt Exp $ */ +/* $NetBSD: pcib.c,v 1.5 2008/05/04 00:18:16 martin Exp $ */ /*- * Copyright (c) 1996, 1998 The NetBSD Foundation, Inc. @@ -15,19 +15,12 @@ * 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 NetBSD - * Foundation, Inc. and its contributors. - * 4. Neither the name of The NetBSD Foundation 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 NETBSD FOUNDATION, INC. 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 + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION 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 @@ -37,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: pcib.c,v 1.4 2008/04/04 16:04:19 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pcib.c,v 1.5 2008/05/04 00:18:16 martin Exp $"); #include #include diff --git a/sys/arch/powerpc/powerpc/darwin_commpage_machdep.S b/sys/arch/powerpc/powerpc/darwin_commpage_machdep.S index 207d46d14601..09261e4b158d 100644 --- a/sys/arch/powerpc/powerpc/darwin_commpage_machdep.S +++ b/sys/arch/powerpc/powerpc/darwin_commpage_machdep.S @@ -1,4 +1,4 @@ -/* $NetBSD: darwin_commpage_machdep.S,v 1.7 2008/02/14 19:41:54 garbled Exp $ */ +/* $NetBSD: darwin_commpage_machdep.S,v 1.8 2008/05/04 00:18:16 martin Exp $ */ /* * Copyright (c) 2004 The NetBSD Foundation, Inc. @@ -15,18 +15,11 @@ * 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 NetBSD - * Foundation, Inc. and its contributors. - * 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 NETBSD FOUNDATION ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 NETBSD FOUNDATION + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION 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 diff --git a/sys/arch/sun3/sun3/cache.h b/sys/arch/sun3/sun3/cache.h index 1a7a731500da..bd561512c493 100644 --- a/sys/arch/sun3/sun3/cache.h +++ b/sys/arch/sun3/sun3/cache.h @@ -1,4 +1,4 @@ -/* $NetBSD: cache.h,v 1.5 2001/02/07 14:28:50 tsutsui Exp $ */ +/* $NetBSD: cache.h,v 1.6 2008/05/04 00:18:16 martin Exp $ */ /*- * Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -15,19 +15,12 @@ * 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 NetBSD - * Foundation, Inc. and its contributors. - * 4. Neither the name of The NetBSD Foundation 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 NETBSD FOUNDATION, INC. 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 + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION 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 diff --git a/sys/arch/sun68k/stand/libsa/SRT0.S b/sys/arch/sun68k/stand/libsa/SRT0.S index ae0c636fa56d..44b0084d0e7d 100644 --- a/sys/arch/sun68k/stand/libsa/SRT0.S +++ b/sys/arch/sun68k/stand/libsa/SRT0.S @@ -1,4 +1,4 @@ -| $NetBSD: SRT0.S,v 1.1 2001/06/14 12:57:13 fredette Exp $ +| $NetBSD: SRT0.S,v 1.2 2008/05/04 00:18:16 martin Exp $ | Copyright (c) 1998 The NetBSD Foundation, Inc. | All rights reserved. @@ -14,13 +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. All advertising materials mentioning features or use of this software -| must display the following acknowledgement: -| This product includes software developed by the NetBSD -| Foundation, Inc. and its contributors. -| 4. Neither the name of The NetBSD Foundation 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 NETBSD FOUNDATION, INC. AND CONTRIBUTORS | ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED