From: Joerg Sonnenberger <joerg@dragonflybsd.org>
Date: Mon, 17 Jan 2005 17:50:21 +0000 (+0000)
Subject: Avoid possible copyright problems and add the copyright of the
X-Git-Tag: v2.0.1~9102
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/063f96bc9e5f2ef8219a0a1cd4efa526431e7ee0

Avoid possible copyright problems and add the copyright of the
original code and the third clause.
---

diff --git a/sys/bus/pci/pci_isab.c b/sys/bus/pci/pci_isab.c
index 58890391eb..151652140d 100644
--- a/sys/bus/pci/pci_isab.c
+++ b/sys/bus/pci/pci_isab.c
@@ -1,6 +1,7 @@
 /*
  * Copyright (c) 2004, Joerg Sonnenberger <joerg@bec.de>
  * All rights reserved.
+ * Copyright (c) 1994,1995 Stefan Esser.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -11,6 +12,8 @@
  * 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. 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
@@ -23,7 +26,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $DragonFly: src/sys/bus/pci/pci_isab.c,v 1.2 2004/07/16 13:52:20 asmodai Exp $
+ * $DragonFly: src/sys/bus/pci/pci_isab.c,v 1.3 2005/01/17 17:50:21 joerg Exp $
  */
 
 #include "opt_pci.h"
diff --git a/sys/bus/pci/pci_pcib.c b/sys/bus/pci/pci_pcib.c
index b69a70a463..a4c5748dee 100644
--- a/sys/bus/pci/pci_pcib.c
+++ b/sys/bus/pci/pci_pcib.c
@@ -1,6 +1,7 @@
 /*
  * Copyright (c) 2004, Joerg Sonnenberger <joerg@bec.de>
  * All rights reserved.
+ * Copyright (c) 1994,1995 Stefan Esser.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -11,6 +12,8 @@
  * 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. 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
@@ -23,7 +26,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $DragonFly: src/sys/bus/pci/pci_pcib.c,v 1.2 2004/07/16 13:57:23 asmodai Exp $
+ * $DragonFly: src/sys/bus/pci/pci_pcib.c,v 1.3 2005/01/17 17:50:21 joerg Exp $
  */
 
 #include <sys/param.h>