diff options
| author | Martin Pieuchot <mpi@cvs.openbsd.org> | 2013-06-20 09:52:10 +0000 |
|---|---|---|
| committer | Martin Pieuchot <mpi@cvs.openbsd.org> | 2013-06-20 09:52:10 +0000 |
| commit | bb4310ae8425f0b8f24cd6eeb87a6738fec8777a (patch) | |
| tree | 931ef4262f67af47221c384957a05b47e29ebbd6 /sys/dev | |
| parent | 4d94fbeacc12993e6879d0f1f124aeee3eaddb70 (diff) | |
Drop 3rd and 4th clauses from the BSD licence, from the following NetBSD's
revision:
sys/dev/acpi/asus_acpi.c r1.4
sys/dev/cardbus/cardbus_exrom.c r1.11
sys/dev/cardbus/cardbus_exrom.h r1.6
ok kettenis@
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/acpi/acpiasus.c | 8 | ||||
| -rw-r--r-- | sys/dev/cardbus/cardbus_exrom.c | 5 | ||||
| -rw-r--r-- | sys/dev/cardbus/cardbus_exrom.h | 5 |
3 files changed, 3 insertions, 15 deletions
diff --git a/sys/dev/acpi/acpiasus.c b/sys/dev/acpi/acpiasus.c index fc77d371497..48e1bc59d31 100644 --- a/sys/dev/acpi/acpiasus.c +++ b/sys/dev/acpi/acpiasus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: acpiasus.c,v 1.12 2011/06/06 06:13:46 deraadt Exp $ */ +/* $OpenBSD: acpiasus.c,v 1.13 2013/06/20 09:52:09 mpi Exp $ */ /* $NetBSD: asus_acpi.c,v 1.2.2.2 2008/04/03 12:42:37 mjf Exp $ */ /* * Copyright (c) 2007, 2008 Jared D. McNeill <jmcneill@invisible.ca> @@ -12,12 +12,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 Jared D. McNeill. - * 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 diff --git a/sys/dev/cardbus/cardbus_exrom.c b/sys/dev/cardbus/cardbus_exrom.c index 76b706a7aa8..41402f31078 100644 --- a/sys/dev/cardbus/cardbus_exrom.c +++ b/sys/dev/cardbus/cardbus_exrom.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cardbus_exrom.c,v 1.4 2005/09/13 18:44:38 fgsch Exp $ */ +/* $OpenBSD: cardbus_exrom.c,v 1.5 2013/06/20 09:52:09 mpi Exp $ */ /* $NetBSD: cardbus_exrom.c,v 1.4 2000/02/03 06:47:31 thorpej Exp $ */ /* @@ -19,9 +19,6 @@ * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * 3. 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 diff --git a/sys/dev/cardbus/cardbus_exrom.h b/sys/dev/cardbus/cardbus_exrom.h index d822f4b25d4..57375368870 100644 --- a/sys/dev/cardbus/cardbus_exrom.h +++ b/sys/dev/cardbus/cardbus_exrom.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cardbus_exrom.h,v 1.3 2005/09/12 18:52:49 fgsch Exp $ */ +/* $OpenBSD: cardbus_exrom.h,v 1.4 2013/06/20 09:52:09 mpi Exp $ */ /* $NetBSD: cardbus_exrom.h,v 1.2 1999/12/15 12:28:54 kleink Exp $ */ /* @@ -19,9 +19,6 @@ * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * 3. 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 |