diff options
Diffstat (limited to 'sys/dev/sbus')
| -rw-r--r-- | sys/dev/sbus/magma.c | 16 | ||||
| -rw-r--r-- | sys/dev/sbus/magmareg.h | 11 |
2 files changed, 7 insertions, 20 deletions
diff --git a/sys/dev/sbus/magma.c b/sys/dev/sbus/magma.c index abdb3b62ad5..658780708dd 100644 --- a/sys/dev/sbus/magma.c +++ b/sys/dev/sbus/magma.c @@ -1,7 +1,6 @@ -/* $OpenBSD: magma.c,v 1.15 2005/07/09 22:23:15 miod Exp $ */ -/* - * magma.c - * +/* $OpenBSD: magma.c,v 1.16 2008/11/29 01:55:06 ray Exp $ */ + +/*- * 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,10 +23,10 @@ * 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. - * -#define MAGMA_DEBUG */ +#define MAGMA_DEBUG + /* * Driver for Magma SBus Serial/Parallel cards using the Cirrus Logic * CD1400 & CD1190 chips 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 |