diff options
| author | Martin Pieuchot <mpi@cvs.openbsd.org> | 2013-03-09 11:33:26 +0000 |
|---|---|---|
| committer | Martin Pieuchot <mpi@cvs.openbsd.org> | 2013-03-09 11:33:26 +0000 |
| commit | 6caaed06a7a2993dffb256c95dfa4ab9f364cf41 (patch) | |
| tree | d27ff855184bfba2b66fb8c23cdd5d62195b9eb0 | |
| parent | 235d5d6df0382dfe49ddf14da2bb5513b8678420 (diff) | |
Drop 3rd and 4th clauses from Bradley A. Grantham's license, from NetBSD
via Daniel Dickman.
ok deraadt@
| -rw-r--r-- | sys/arch/macppc/dev/adb.c | 7 | ||||
| -rw-r--r-- | sys/arch/macppc/dev/adbvar.h | 7 | ||||
| -rw-r--r-- | sys/dev/adb/adb_subr.c | 7 |
3 files changed, 3 insertions, 18 deletions
diff --git a/sys/arch/macppc/dev/adb.c b/sys/arch/macppc/dev/adb.c index e622198725d..1300d7dfc70 100644 --- a/sys/arch/macppc/dev/adb.c +++ b/sys/arch/macppc/dev/adb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: adb.c,v 1.34 2011/06/16 10:51:48 mpi Exp $ */ +/* $OpenBSD: adb.c,v 1.35 2013/03/09 11:33:25 mpi Exp $ */ /* $NetBSD: adb.c,v 1.6 1999/08/16 06:28:09 tsubai Exp $ */ /* $NetBSD: adb_direct.c,v 1.14 2000/06/08 22:10:45 tsubai Exp $ */ @@ -44,11 +44,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 Bradley A. Grantham. - * 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 AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES diff --git a/sys/arch/macppc/dev/adbvar.h b/sys/arch/macppc/dev/adbvar.h index 06b63af60e3..dbf1270f06e 100644 --- a/sys/arch/macppc/dev/adbvar.h +++ b/sys/arch/macppc/dev/adbvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: adbvar.h,v 1.8 2006/01/18 23:21:17 miod Exp $ */ +/* $OpenBSD: adbvar.h,v 1.9 2013/03/09 11:33:25 mpi Exp $ */ /* $NetBSD: adbvar.h,v 1.3 2000/06/08 22:10:46 tsubai Exp $ */ /*- @@ -13,11 +13,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 Bradley A. Grantham. - * 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 AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES diff --git a/sys/dev/adb/adb_subr.c b/sys/dev/adb/adb_subr.c index d558f9e3593..c9d89b5e6bb 100644 --- a/sys/dev/adb/adb_subr.c +++ b/sys/dev/adb/adb_subr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: adb_subr.c,v 1.3 2011/06/15 21:32:05 miod Exp $ */ +/* $OpenBSD: adb_subr.c,v 1.4 2013/03/09 11:33:24 mpi Exp $ */ /* $NetBSD: adb.c,v 1.6 1999/08/16 06:28:09 tsubai Exp $ */ /*- @@ -13,11 +13,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 Bradley A. Grantham. - * 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 AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES |