summaryrefslogtreecommitdiff
path: root/sys/dev/mii/ukphy.c
diff options
context:
space:
mode:
authorJonathan Gray <jsg@cvs.openbsd.org>2010-07-23 07:47:14 +0000
committerJonathan Gray <jsg@cvs.openbsd.org>2010-07-23 07:47:14 +0000
commit7628427a444724b699d4be2d43faee91945cbb40 (patch)
tree439d0f788917b5bdff0861eb9f5ccf87d37eb84a /sys/dev/mii/ukphy.c
parent58f4f122d27f7f50f3c5eca149588a37bf8e70c8 (diff)
Manuel Bouyer rescinded clauses 3 and 4 of his license text.
Diffstat (limited to 'sys/dev/mii/ukphy.c')
-rw-r--r--sys/dev/mii/ukphy.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/sys/dev/mii/ukphy.c b/sys/dev/mii/ukphy.c
index 8009c0ac6bf..5b411b9218d 100644
--- a/sys/dev/mii/ukphy.c
+++ b/sys/dev/mii/ukphy.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ukphy.c,v 1.19 2008/06/26 05:42:17 ray Exp $ */
+/* $OpenBSD: ukphy.c,v 1.20 2010/07/23 07:47:13 jsg Exp $ */
/* $NetBSD: ukphy.c,v 1.9 2000/02/02 23:34:57 thorpej Exp $ */
/*-
@@ -42,11 +42,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 Manuel Bouyer.
- * 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