diff options
author | Ray Lai <ray@cvs.openbsd.org> | 2008-11-29 01:55:07 +0000 |
---|---|---|
committer | Ray Lai <ray@cvs.openbsd.org> | 2008-11-29 01:55:07 +0000 |
commit | a887de748e0a6cb7cc29898e140d58163fc6acce (patch) | |
tree | ee490e53840270065b3d816a0df86e25d3b9e5fd /sys/dev/sbus/magmareg.h | |
parent | a8b8a822472613ed8ecee61e7c1c886e3116040e (diff) |
Iain Hibbert (plunky@netbsd) removed clauses 3 and 4 from his
licenses as well. Thanks!
"Groovy" deraadt
Diffstat (limited to 'sys/dev/sbus/magmareg.h')
-rw-r--r-- | sys/dev/sbus/magmareg.h | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/sys/dev/sbus/magmareg.h b/sys/dev/sbus/magmareg.h index 77d806b544d..998055b16f3 100644 --- a/sys/dev/sbus/magmareg.h +++ b/sys/dev/sbus/magmareg.h @@ -1,7 +1,6 @@ -/* $OpenBSD: magmareg.h,v 1.8 2006/03/04 13:00:55 miod Exp $ */ +/* $OpenBSD: magmareg.h,v 1.9 2008/11/29 01:55:06 ray Exp $ */ -/* magmareg.h - * +/*- * Copyright (c) 1998 Iain Hibbert * All rights reserved. * @@ -13,11 +12,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 Iain Hibbert - * 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 @@ -29,7 +23,6 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * */ #ifdef MAGMA_DEBUG |