summaryrefslogtreecommitdiff
path: root/sys/dev/cardbus/cardbusvar.h
diff options
context:
space:
mode:
authorJonathan Gray <jsg@cvs.openbsd.org>2010-01-13 09:10:34 +0000
committerJonathan Gray <jsg@cvs.openbsd.org>2010-01-13 09:10:34 +0000
commit64080df7e33f62de74bee6c0ba1be3687e13fb1a (patch)
tree163e3c484e4a1e74d4b09ed95db0d1d88da91b0a /sys/dev/cardbus/cardbusvar.h
parent3892b232242e82024289661ad03940c49fa4934d (diff)
As per NetBSD move HAYAKAWA Koichi's licenses to two clause.
Diffstat (limited to 'sys/dev/cardbus/cardbusvar.h')
-rw-r--r--sys/dev/cardbus/cardbusvar.h7
1 files changed, 1 insertions, 6 deletions
diff --git a/sys/dev/cardbus/cardbusvar.h b/sys/dev/cardbus/cardbusvar.h
index 7b86ef67150..9e7e4088f0f 100644
--- a/sys/dev/cardbus/cardbusvar.h
+++ b/sys/dev/cardbus/cardbusvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cardbusvar.h,v 1.14 2009/07/25 13:00:03 miod Exp $ */
+/* $OpenBSD: cardbusvar.h,v 1.15 2010/01/13 09:10:33 jsg Exp $ */
/* $NetBSD: cardbusvar.h,v 1.17 2000/04/02 19:11:37 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 the author.
- * 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