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/dev/cardbus/cardbus_map.c | |
| 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/dev/cardbus/cardbus_map.c')
| -rw-r--r-- | sys/dev/cardbus/cardbus_map.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/sys/dev/cardbus/cardbus_map.c b/sys/dev/cardbus/cardbus_map.c index 9e8a4864535..86c2bf97394 100644 --- a/sys/dev/cardbus/cardbus_map.c +++ b/sys/dev/cardbus/cardbus_map.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cardbus_map.c,v 1.9 2009/07/23 15:09:41 kettenis Exp $ */ +/* $OpenBSD: cardbus_map.c,v 1.10 2010/01/13 09:10:33 jsg Exp $ */ /* $NetBSD: cardbus_map.c,v 1.10 2000/03/07 00:31:46 mycroft 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 |