diff options
| author |   jsg <jsg@openbsd.org> | 2010-01-13 09:10:33 +0000 |
|---|---|---|
| committer | jsg <jsg@openbsd.org> | 2010-01-13 09:10:33 +0000 |
| commit | 9a7547d2507b2311d09ffb51ce7f61f26b4f6bb1 (patch) | |
| tree | fc893db5ce3a8a83cd90788222ed0ce830bf65bc /sys/arch/macppc | |
| parent | Cookie or done is set on entry to scsi_xs_sync(). Take panic() out (diff) | |
| download | wireguard-openbsd-9a7547d2507b2311d09ffb51ce7f61f26b4f6bb1.tar.xz wireguard-openbsd-9a7547d2507b2311d09ffb51ce7f61f26b4f6bb1.zip | |
As per NetBSD move HAYAKAWA Koichi's licenses to two clause.
Diffstat (limited to 'sys/arch/macppc')
| -rw-r--r-- | sys/arch/macppc/include/rbus_machdep.h | 7 | ||||
| -rw-r--r-- | sys/arch/macppc/macppc/rbus_machdep.c | 7 |
2 files changed, 2 insertions, 12 deletions
diff --git a/sys/arch/macppc/include/rbus_machdep.h b/sys/arch/macppc/include/rbus_machdep.h index a371dc209a9..01278552673 100644 --- a/sys/arch/macppc/include/rbus_machdep.h +++ b/sys/arch/macppc/include/rbus_machdep.h @@ -1,4 +1,4 @@ -/* $OpenBSD: rbus_machdep.h,v 1.4 2009/07/21 21:20:05 miod Exp $ */ +/* $OpenBSD: rbus_machdep.h,v 1.5 2010/01/13 09:10:33 jsg Exp $ */ /* $NetBSD: rbus_machdep.h,v 1.2 1999/10/15 06:43:05 haya 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 HAYAKAWA Koichi. - * 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/macppc/rbus_machdep.c b/sys/arch/macppc/macppc/rbus_machdep.c index add5956a68d..b4cce887967 100644 --- a/sys/arch/macppc/macppc/rbus_machdep.c +++ b/sys/arch/macppc/macppc/rbus_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rbus_machdep.c,v 1.8 2009/05/03 21:30:09 kettenis Exp $ */ +/* $OpenBSD: rbus_machdep.c,v 1.9 2010/01/13 09:10:33 jsg Exp $ */ /* $NetBSD: rbus_machdep.c,v 1.2 1999/10/15 06:43:06 haya 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 HAYAKAWA Koichi. - * 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 |