summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorReyk Floeter <reyk@cvs.openbsd.org>2007-06-06 21:41:33 +0000
committerReyk Floeter <reyk@cvs.openbsd.org>2007-06-06 21:41:33 +0000
commitc6ae1a61db9f46bbc4204088cb00004948cf632d (patch)
tree7228a6a4cfba5b9bc98402831df2256f8a2d643d
parentf90e9babf2a61ff2720288d1de9025bb87025d99 (diff)
the copyright holder changed the license from "dual bsd/gpl" to be
2-clause bsd-only. good.
-rw-r--r--sys/dev/ic/ath.c6
-rw-r--r--sys/dev/ic/athvar.h6
-rw-r--r--sys/dev/pci/if_ath_pci.c6
3 files changed, 3 insertions, 15 deletions
diff --git a/sys/dev/ic/ath.c b/sys/dev/ic/ath.c
index 07cfd9759d7..c9e62d172b5 100644
--- a/sys/dev/ic/ath.c
+++ b/sys/dev/ic/ath.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ath.c,v 1.63 2007/05/09 16:41:14 reyk Exp $ */
+/* $OpenBSD: ath.c,v 1.64 2007/06/06 21:41:32 reyk Exp $ */
/* $NetBSD: ath.c,v 1.37 2004/08/18 21:59:39 dyoung Exp $ */
/*-
@@ -19,10 +19,6 @@
* of any contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
*
- * Alternatively, this software may be distributed under the terms of the
- * GNU General Public License ("GPL") version 2 as published by the Free
- * Software Foundation.
- *
* NO WARRANTY
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
diff --git a/sys/dev/ic/athvar.h b/sys/dev/ic/athvar.h
index dade9abc274..4f604cb4947 100644
--- a/sys/dev/ic/athvar.h
+++ b/sys/dev/ic/athvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: athvar.h,v 1.19 2007/04/13 14:44:41 reyk Exp $ */
+/* $OpenBSD: athvar.h,v 1.20 2007/06/06 21:41:32 reyk Exp $ */
/* $NetBSD: athvar.h,v 1.10 2004/08/10 01:03:53 dyoung Exp $ */
/*-
@@ -19,10 +19,6 @@
* of any contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
*
- * Alternatively, this software may be distributed under the terms of the
- * GNU General Public License ("GPL") version 2 as published by the Free
- * Software Foundation.
- *
* NO WARRANTY
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
diff --git a/sys/dev/pci/if_ath_pci.c b/sys/dev/pci/if_ath_pci.c
index 3da62148cd2..ae083c3aa68 100644
--- a/sys/dev/pci/if_ath_pci.c
+++ b/sys/dev/pci/if_ath_pci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_ath_pci.c,v 1.14 2007/04/13 14:44:41 reyk Exp $ */
+/* $OpenBSD: if_ath_pci.c,v 1.15 2007/06/06 21:41:31 reyk Exp $ */
/* $NetBSD: if_ath_pci.c,v 1.7 2004/06/30 05:58:17 mycroft Exp $ */
/*-
@@ -19,10 +19,6 @@
* of any contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
*
- * Alternatively, this software may be distributed under the terms of the
- * GNU General Public License ("GPL") version 2 as published by the Free
- * Software Foundation.
- *
* NO WARRANTY
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT