summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorjdolecek <jdolecek@NetBSD.org>2003-12-10 16:35:20 +0000
committerjdolecek <jdolecek@NetBSD.org>2003-12-10 16:35:20 +0000
commitd5bf86dcf480dc1d5979415eaa3fac33f732b049 (patch)
treeddce037737229761bb2429869ee78f16e30f6aae /sys/dev
parentcb9ecf8b7f3cd8b731ca7c2fe917ac6b346bff34 (diff)
Modify the licences of code written by Theo De Raadt from a 4-clause
to a 2-clause licence (retaining UCB clauses (1) and (2)), per PR 22409 from Joel Baker, approved by Theo de Raadt.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/sun/disksubr.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/sys/dev/sun/disksubr.c b/sys/dev/sun/disksubr.c
index 6ae46f703ca..1035d469702 100644
--- a/sys/dev/sun/disksubr.c
+++ b/sys/dev/sun/disksubr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: disksubr.c,v 1.1 2003/11/15 17:52:31 bouyer Exp $ */
+/* $NetBSD: disksubr.c,v 1.2 2003/12/10 16:35:20 jdolecek Exp $ */
/*
* Copyright (c) 1982, 1986, 1988 Regents of the University of California.
@@ -41,11 +41,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 Theo de Raadt.
- * 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
@@ -60,7 +55,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.1 2003/11/15 17:52:31 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.2 2003/12/10 16:35:20 jdolecek Exp $");
#include <sys/param.h>
#include <sys/systm.h>