Start all license statements with /*-

40 files changed, 39 insertions, 43 deletions

diff --git a/sys/arm/include/_limits.h b/sys/arm/include/_limits.h
index 2d6c7bd96be0..25616e5a390a 100644
--- a/sys/arm/include/_limits.h
+++ b/sys/arm/include/_limits.h
@@ -1,4 +1,4 @@
-/*
+/*-
  * Copyright (c) 1988, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/sys/arm/include/armreg.h b/sys/arm/include/armreg.h
index 001c997abbad..489a8ed89959 100644
--- a/sys/arm/include/armreg.h
+++ b/sys/arm/include/armreg.h
@@ -1,6 +1,6 @@
 /*	$NetBSD: armreg.h,v 1.28 2003/10/31 16:30:15 scw Exp $	*/
 
-/*
+/*-
  * Copyright (c) 1998, 2001 Ben Harris
  * Copyright (c) 1994-1996 Mark Brinicombe.
  * Copyright (c) 1994 Brini.
diff --git a/sys/arm/include/asm.h b/sys/arm/include/asm.h
index db8b8258142c..a1a0c435193c 100644
--- a/sys/arm/include/asm.h
+++ b/sys/arm/include/asm.h
@@ -1,6 +1,6 @@
 /*	$NetBSD: asm.h,v 1.5 2003/08/07 16:26:53 agc Exp $	*/
 
-/*
+/*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
  *
diff --git a/sys/arm/include/asmacros.h b/sys/arm/include/asmacros.h
index 4b1aab3e7dd2..bf5795c9159f 100644
--- a/sys/arm/include/asmacros.h
+++ b/sys/arm/include/asmacros.h
@@ -1,6 +1,6 @@
 /*	$NetBSD: frame.h,v 1.6 2003/10/05 19:44:58 matt Exp $	*/
 
-/*
+/*-
  * Copyright (c) 1994-1997 Mark Brinicombe.
  * Copyright (c) 1994 Brini.
  * All rights reserved.
diff --git a/sys/arm/include/atomic.h b/sys/arm/include/atomic.h
index ec1fd9f1ee0b..2eaa06620fb3 100644
--- a/sys/arm/include/atomic.h
+++ b/sys/arm/include/atomic.h
@@ -1,6 +1,6 @@
 /* $NetBSD: atomic.h,v 1.1 2002/10/19 12:22:34 bsh Exp $ */
 
-/*
+/*-
  * Copyright (C) 2003-2004 Olivier Houchard
  * Copyright (C) 1994-1997 Mark Brinicombe
  * Copyright (C) 1994 Brini
diff --git a/sys/arm/include/bootconfig.h b/sys/arm/include/bootconfig.h
index 4745ee20361d..04467a03b7d7 100644
--- a/sys/arm/include/bootconfig.h
+++ b/sys/arm/include/bootconfig.h
@@ -1,6 +1,6 @@
 /*	$NetBSD: bootconfig.h,v 1.1 2001/05/13 13:46:23 bjh21 Exp $	*/
 
-/*
+/*-
  * Copyright (c) 1994 Mark Brinicombe.
  * Copyright (c) 1994 Brini.
  * All rights reserved.
diff --git a/sys/arm/include/bus.h b/sys/arm/include/bus.h
index 5374507293b8..bd7dc612be9e 100644
--- a/sys/arm/include/bus.h
+++ b/sys/arm/include/bus.h
@@ -37,7 +37,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-/*
+/*-
  * Copyright (c) 1996 Charles M. Hannum.  All rights reserved.
  * Copyright (c) 1996 Christopher G. Demetriou.  All rights reserved.
  *
diff --git a/sys/arm/include/bus_memio.h b/sys/arm/include/bus_memio.h
index f27ce0018fe8..24410006b93c 100644
--- a/sys/arm/include/bus_memio.h
+++ b/sys/arm/include/bus_memio.h
@@ -1,4 +1,4 @@
-/*
+/*-
  * Copyright (c) 1997 Justin Gibbs.
  * All rights reserved.
  *
diff --git a/sys/arm/include/bus_pio.h b/sys/arm/include/bus_pio.h
index 06a996b56095..aba61dfddfcd 100644
--- a/sys/arm/include/bus_pio.h
+++ b/sys/arm/include/bus_pio.h
@@ -1,4 +1,4 @@
-/*
+/*-
  * Copyright (c) 1997 Justin Gibbs.
  * All rights reserved.
  *
diff --git a/sys/arm/include/cpuconf.h b/sys/arm/include/cpuconf.h
index 298c98539291..cd077ab25445 100644
--- a/sys/arm/include/cpuconf.h
+++ b/sys/arm/include/cpuconf.h
@@ -1,6 +1,6 @@
 /*	$NetBSD: cpuconf.h,v 1.8 2003/09/06 08:55:42 rearnsha Exp $	*/
 
-/*
+/*-
  * Copyright (c) 2002 Wasabi Systems, Inc.
  * All rights reserved.
  *
diff --git a/sys/arm/include/cpufunc.h b/sys/arm/include/cpufunc.h
index d1b5786180f7..9a7e70b6febf 100644
--- a/sys/arm/include/cpufunc.h
+++ b/sys/arm/include/cpufunc.h
@@ -1,6 +1,6 @@
 /*	$NetBSD: cpufunc.h,v 1.29 2003/09/06 09:08:35 rearnsha Exp $	*/
 
-/*
+/*-
  * Copyright (c) 1997 Mark Brinicombe.
  * Copyright (c) 1997 Causality Limited
  * All rights reserved.
diff --git a/sys/arm/include/db_machdep.h b/sys/arm/include/db_machdep.h
index 0682311866d5..ae7de16fc628 100644
--- a/sys/arm/include/db_machdep.h
+++ b/sys/arm/include/db_machdep.h
@@ -1,4 +1,4 @@
-/*
+/*-
  * Mach Operating System
  * Copyright (c) 1991,1990 Carnegie Mellon University
  * All Rights Reserved.
diff --git a/sys/arm/include/disassem.h b/sys/arm/include/disassem.h
index 05fdb890e82e..526875527b3f 100644
--- a/sys/arm/include/disassem.h
+++ b/sys/arm/include/disassem.h
@@ -1,6 +1,6 @@
 /*	$NetBSD: disassem.h,v 1.4 2001/03/04 04:15:58 matt Exp $	*/
 
-/*
+/*-
  * Copyright (c) 1997 Mark Brinicombe.
  * Copyright (c) 1997 Causality Limited.
  *
diff --git a/sys/arm/include/endian.h b/sys/arm/include/endian.h
index ad666fe1704a..d3c4c9816e0c 100644
--- a/sys/arm/include/endian.h
+++ b/sys/arm/include/endian.h
@@ -1,4 +1,4 @@
-/*
+/*-
  * Copyright (c) 2001 David E. O'Brien
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/sys/arm/include/exec.h b/sys/arm/include/exec.h
index afa3b12729cf..dca62d2f5857 100644
--- a/sys/arm/include/exec.h
+++ b/sys/arm/include/exec.h
@@ -1,4 +1,4 @@
-/*
+/*-
  * Copyright (c) 2001 David E. O'Brien
  * All rights reserved.
  *
diff --git a/sys/arm/include/fiq.h b/sys/arm/include/fiq.h
index acc1ed8374bb..ccb29a8d7b5f 100644
--- a/sys/arm/include/fiq.h
+++ b/sys/arm/include/fiq.h
@@ -1,6 +1,6 @@
 /*	$NetBSD: fiq.h,v 1.1 2001/12/20 01:20:23 thorpej Exp $	*/
 
-/*
+/*-
  * Copyright (c) 2001 Wasabi Systems, Inc.
  * All rights reserved.
  *
diff --git a/sys/arm/include/float.h b/sys/arm/include/float.h
index 21761ec37011..424fb7c146dd 100644
--- a/sys/arm/include/float.h
+++ b/sys/arm/include/float.h
@@ -1,4 +1,4 @@
-/*
+/*-
  * Copyright (c) 1989 Regents of the University of California.
  * All rights reserved.
  *
diff --git a/sys/arm/include/fp.h b/sys/arm/include/fp.h
index 0626733d5543..ada720303c7d 100644
--- a/sys/arm/include/fp.h
+++ b/sys/arm/include/fp.h
@@ -1,6 +1,6 @@
 /*	$NetBSD: fp.h,v 1.1 2001/01/10 19:02:06 bjh21 Exp $	*/
 
-/*
+/*-
  * Copyright (c) 1995 Mark Brinicombe.
  * Copyright (c) 1995 Brini.
  * All rights reserved.
diff --git a/sys/arm/include/frame.h b/sys/arm/include/frame.h
index 74faa5b47e59..4d70c20843dc 100644
--- a/sys/arm/include/frame.h
+++ b/sys/arm/include/frame.h
@@ -1,6 +1,6 @@
 /*	$NetBSD: frame.h,v 1.5 2002/10/19 00:10:54 bjh21 Exp $	*/
 
-/*
+/*-
  * Copyright (c) 1994-1997 Mark Brinicombe.
  * Copyright (c) 1994 Brini.
  * All rights reserved.
diff --git a/sys/arm/include/ieee.h b/sys/arm/include/ieee.h
index 568bae37a7ae..a7411dd2332a 100644
--- a/sys/arm/include/ieee.h
+++ b/sys/arm/include/ieee.h
@@ -1,6 +1,6 @@
 /*	$NetBSD: ieee754.h,v 1.4 2003/10/27 02:30:26 simonb Exp $	*/
 
-/*
+/*-
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/sys/arm/include/ieeefp.h b/sys/arm/include/ieeefp.h
index 0d0868605a91..8fc9811ce60f 100644
--- a/sys/arm/include/ieeefp.h
+++ b/sys/arm/include/ieeefp.h
@@ -1,6 +1,6 @@
 /*	$NetBSD: ieeefp.h,v 1.1 2001/01/10 19:02:06 bjh21 Exp $	*/
 /* $FreeBSD$ */
-/* 
+/*-
  * Based on ieeefp.h written by J.T. Conklin, Apr 28, 1995
  * Public domain.
  */
diff --git a/sys/arm/include/intr.h b/sys/arm/include/intr.h
index f0ccf889b201..15f853dc5405 100644
--- a/sys/arm/include/intr.h
+++ b/sys/arm/include/intr.h
@@ -1,6 +1,6 @@
 /* 	$NetBSD: intr.h,v 1.7 2003/06/16 20:01:00 thorpej Exp $	*/
 
-/*
+/*-
  * Copyright (c) 1997 Mark Brinicombe.
  * All rights reserved.
  *
diff --git a/sys/arm/include/katelib.h b/sys/arm/include/katelib.h
index b449511991aa..ef69fe37238f 100644
--- a/sys/arm/include/katelib.h
+++ b/sys/arm/include/katelib.h
@@ -1,6 +1,6 @@
 /*	$NetBSD: katelib.h,v 1.3 2001/11/23 19:21:48 thorpej Exp $	*/
 
-/*
+/*-
  * Copyright (c) 1994-1996 Mark Brinicombe.
  * Copyright (c) 1994 Brini.
  * All rights reserved.
diff --git a/sys/arm/include/kdb.h b/sys/arm/include/kdb.h
index 0adf7e113b17..9d933d628f37 100644
--- a/sys/arm/include/kdb.h
+++ b/sys/arm/include/kdb.h
@@ -1,4 +1,4 @@
-/*
+/*-
  * Copyright (c) 2004 Marcel Moolenaar
  * All rights reserved.
  *
diff --git a/sys/arm/include/limits.h b/sys/arm/include/limits.h
index b7810fd22083..8e3bb11edfc3 100644
--- a/sys/arm/include/limits.h
+++ b/sys/arm/include/limits.h
@@ -1,4 +1,4 @@
-/*
+/*-
  * Copyright (c) 1988, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/sys/arm/include/metadata.h b/sys/arm/include/metadata.h
index 32497a46f870..84e6f8739970 100644
--- a/sys/arm/include/metadata.h
+++ b/sys/arm/include/metadata.h
@@ -1,4 +1,4 @@
-/*
+/*-
  * Copyright (c) 2003 Peter Wemm <peter@FreeBSD.org>
  * All rights reserved.
  *
diff --git a/sys/arm/include/pcb.h b/sys/arm/include/pcb.h
index 02f7ee4d8768..4a5f330b8a53 100644
--- a/sys/arm/include/pcb.h
+++ b/sys/arm/include/pcb.h
@@ -1,6 +1,6 @@
 /*	$NetBSD: pcb.h,v 1.10 2003/10/13 21:46:39 scw Exp $	*/
 
-/*
+/*-
  * Copyright (c) 2001 Matt Thomas <matt@3am-software.com>.
  * Copyright (c) 1994 Mark Brinicombe.
  * All rights reserved.
diff --git a/sys/arm/include/pmap.h b/sys/arm/include/pmap.h
index 2080da31e054..cc4eeda41c08 100644
--- a/sys/arm/include/pmap.h
+++ b/sys/arm/include/pmap.h
@@ -1,4 +1,4 @@
-/*
+/*-
  * Copyright (c) 1991 Regents of the University of California.
  * All rights reserved.
  *
diff --git a/sys/arm/include/proc.h b/sys/arm/include/proc.h
index 5d722583749f..f7e78aed46f9 100644
--- a/sys/arm/include/proc.h
+++ b/sys/arm/include/proc.h
@@ -1,4 +1,4 @@
-/*
+/*-
  * Copyright (c) 1991 Regents of the University of California.
  * All rights reserved.
  *
diff --git a/sys/arm/include/profile.h b/sys/arm/include/profile.h
index ae80795658b6..81781bc25943 100644
--- a/sys/arm/include/profile.h
+++ b/sys/arm/include/profile.h
@@ -1,4 +1,4 @@
-/*
+/*-
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/sys/arm/include/psl.h b/sys/arm/include/psl.h
index 7ee8e915a46a..c86ddb8675c6 100644
--- a/sys/arm/include/psl.h
+++ b/sys/arm/include/psl.h
@@ -1,6 +1,6 @@
 /*	$NetBSD: psl.h,v 1.6 2003/06/16 20:00:58 thorpej Exp $	*/
 
-/*
+/*-
  * Copyright (c) 1995 Mark Brinicombe.
  * All rights reserved.
  *
diff --git a/sys/arm/include/pte.h b/sys/arm/include/pte.h
index bb662dacb234..58149effdf24 100644
--- a/sys/arm/include/pte.h
+++ b/sys/arm/include/pte.h
@@ -1,6 +1,6 @@
 /*	$NetBSD: pte.h,v 1.1 2001/11/23 17:39:04 thorpej Exp $	*/
 
-/*
+/*-
  * Copyright (c) 1994 Mark Brinicombe.
  * All rights reserved.
  *
diff --git a/sys/arm/include/resource.h b/sys/arm/include/resource.h
index 783a1c468a38..229d14f253b0 100644
--- a/sys/arm/include/resource.h
+++ b/sys/arm/include/resource.h
@@ -1,4 +1,4 @@
-/*
+/*-
  * Copyright 1998 Massachusetts Institute of Technology
  *
  * Permission to use, copy, modify, and distribute this software and
diff --git a/sys/arm/include/runq.h b/sys/arm/include/runq.h
index 2a21bfa4ca29..e906fa192c6c 100644
--- a/sys/arm/include/runq.h
+++ b/sys/arm/include/runq.h
@@ -1,4 +1,4 @@
-/*
+/*-
  * Copyright (c) 2001 Jake Burkholder <jake@FreeBSD.org>
  * All rights reserved.
  *
diff --git a/sys/arm/include/signal.h b/sys/arm/include/signal.h
index d4f08349f8ec..abc5188ce967 100644
--- a/sys/arm/include/signal.h
+++ b/sys/arm/include/signal.h
@@ -1,4 +1,4 @@
-/*
+/*-
  * Copyright (c) 1986, 1989, 1991, 1993
  *      The Regents of the University of California.  All rights reserved.
  *
diff --git a/sys/arm/include/stdarg.h b/sys/arm/include/stdarg.h
index 128fb33e5c79..cf8aef59f239 100644
--- a/sys/arm/include/stdarg.h
+++ b/sys/arm/include/stdarg.h
@@ -11,10 +11,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 the University of
- *	California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
diff --git a/sys/arm/include/swi.h b/sys/arm/include/swi.h
index fef56ea59209..858ed2368b0d 100644
--- a/sys/arm/include/swi.h
+++ b/sys/arm/include/swi.h
@@ -1,7 +1,7 @@
 /*	$NetBSD: swi.h,v 1.1 2002/01/13 15:03:06 bjh21 Exp $	*/
 /* $FreeBSD$ */
 
-/*
+/*-
  * This file is in the Public Domain.
  * Ben Harris, 2002.
  */
diff --git a/sys/arm/include/sysarch.h b/sys/arm/include/sysarch.h
index 8ff3f1803582..6a8a6d7cb7bd 100644
--- a/sys/arm/include/sysarch.h
+++ b/sys/arm/include/sysarch.h
@@ -1,6 +1,6 @@
 /*	$NetBSD: sysarch.h,v 1.5 2003/09/11 09:40:12 kleink Exp $	*/
 
-/*
+/*-
  * Copyright (c) 1996-1997 Mark Brinicombe.
  * All rights reserved.
  *
diff --git a/sys/arm/include/undefined.h b/sys/arm/include/undefined.h
index 4a0a13681b04..9460f706a75a 100644
--- a/sys/arm/include/undefined.h
+++ b/sys/arm/include/undefined.h
@@ -1,6 +1,6 @@
 /*	$NetBSD: undefined.h,v 1.4 2001/12/20 01:20:23 thorpej Exp $	*/
 
-/*
+/*-
  * Copyright (c) 1995-1996 Mark Brinicombe.
  * Copyright (c) 1995 Brini.
  * All rights reserved.
diff --git a/sys/arm/include/vmparam.h b/sys/arm/include/vmparam.h
index fda8b679a7d5..d43082c42ac2 100644
--- a/sys/arm/include/vmparam.h
+++ b/sys/arm/include/vmparam.h
@@ -1,6 +1,6 @@
 /*	$NetBSD: vmparam.h,v 1.26 2003/08/07 16:27:47 agc Exp $	*/
 
-/*
+/*-
  * Copyright (c) 1988 The Regents of the University of California.
  * All rights reserved.
  *