summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Kettenis <kettenis@cvs.openbsd.org>2006-01-28 11:25:18 +0000
committerMark Kettenis <kettenis@cvs.openbsd.org>2006-01-28 11:25:18 +0000
commitebc76a7282487e6ef4c409ad579903a76d2d11de (patch)
treea73585be87e0671e6cf39c70fff8aac2f41760de
parent6b5eaa502121f6a575636ce49894a7db9a5f0002 (diff)
Rename lm_isa.c to lm78_isa.c. Now that there isn't really any NetBSD code
left, replace copyright with my own. requested by deraadt@
-rw-r--r--sys/dev/isa/files.isa4
-rw-r--r--sys/dev/isa/lm78_isa.c (renamed from sys/dev/isa/lm_isa.c)47
2 files changed, 15 insertions, 36 deletions
diff --git a/sys/dev/isa/files.isa b/sys/dev/isa/files.isa
index c5a45f270d1..71d74c49453 100644
--- a/sys/dev/isa/files.isa
+++ b/sys/dev/isa/files.isa
@@ -1,4 +1,4 @@
-# $OpenBSD: files.isa,v 1.92 2006/01/14 15:14:33 kettenis Exp $
+# $OpenBSD: files.isa,v 1.93 2006/01/28 11:25:17 kettenis Exp $
# $NetBSD: files.isa,v 1.21 1996/05/16 03:45:55 mycroft Exp $
#
# Config file and device description for machine-independent ISA code.
@@ -376,7 +376,7 @@ file dev/isa/lpt_isa.c lpt_isa needs-flag
# National Semiconductor LM78/79/81 and compatible hardware monitors
attach lm at isa with lm_isa
-file dev/isa/lm_isa.c lm_isa
+file dev/isa/lm78_isa.c lm_isa
# NSC PC87366 Super IO / monitor chip
device nsclpcsio: gpiobus
diff --git a/sys/dev/isa/lm_isa.c b/sys/dev/isa/lm78_isa.c
index 3499be4051a..adf4522b780 100644
--- a/sys/dev/isa/lm_isa.c
+++ b/sys/dev/isa/lm78_isa.c
@@ -1,40 +1,19 @@
-/* $OpenBSD: lm_isa.c,v 1.10 2006/01/26 22:07:14 kettenis Exp $ */
-/* $NetBSD: lm_isa.c,v 1.9 2002/11/15 14:55:44 ad Exp $ */
+/* $OpenBSD: lm78_isa.c,v 1.1 2006/01/28 11:25:17 kettenis Exp $ */
-/*-
- * Copyright (c) 2000 The NetBSD Foundation, Inc.
- * All rights reserved.
+/*
+ * Copyright (c) 2005, 2006 Mark Kettenis
*
- * This code is derived from software contributed to The NetBSD Foundation
- * by Bill Squier.
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
*
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 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 NetBSD
- * Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY 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.
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#include <sys/param.h>