Start all license statements with /*-

116 files changed, 121 insertions, 165 deletions

diff --git a/sys/arm/arm/bcopy_page.S b/sys/arm/arm/bcopy_page.S
index 9fb79a1..9e13c5d 100644
--- a/sys/arm/arm/bcopy_page.S
+++ b/sys/arm/arm/bcopy_page.S
@@ -1,6 +1,6 @@
 /*	$NetBSD: bcopy_page.S,v 1.7 2003/10/13 21:03:13 scw Exp $	*/
 
-/*
+/*-
  * Copyright (c) 1995 Scott Stevens
  * All rights reserved.
  *
diff --git a/sys/arm/arm/bcopyinout.S b/sys/arm/arm/bcopyinout.S
index dcbbf4e..1fc99f5 100644
--- a/sys/arm/arm/bcopyinout.S
+++ b/sys/arm/arm/bcopyinout.S
@@ -1,6 +1,6 @@
 /*	$NetBSD: bcopyinout.S,v 1.11 2003/10/13 21:22:40 scw Exp $	*/
 
-/*
+/*-
  * Copyright (c) 2002 Wasabi Systems, Inc.
  * All rights reserved.
  *
diff --git a/sys/arm/arm/bcopyinout_xscale.S b/sys/arm/arm/bcopyinout_xscale.S
index 744fa59..d75a2dd 100644
--- a/sys/arm/arm/bcopyinout_xscale.S
+++ b/sys/arm/arm/bcopyinout_xscale.S
@@ -1,6 +1,6 @@
 /*	$NetBSD: bcopyinout_xscale.S,v 1.3 2003/12/15 09:27:18 scw Exp $	*/
 
-/*
+/*-
  * Copyright 2003 Wasabi Systems, Inc.
  * All rights reserved.
  *
diff --git a/sys/arm/arm/blockio.S b/sys/arm/arm/blockio.S
index a300aa9..7e750b4 100644
--- a/sys/arm/arm/blockio.S
+++ b/sys/arm/arm/blockio.S
@@ -1,6 +1,6 @@
 /*	$NetBSD: blockio.S,v 1.5 2002/08/15 01:38:16 briggs Exp $	*/
 
-/*
+/*-
  * Copyright (c) 2001 Ben Harris.
  * Copyright (c) 1994 Mark Brinicombe.
  * Copyright (c) 1994 Brini.
diff --git a/sys/arm/arm/bootconfig.c b/sys/arm/arm/bootconfig.c
index 02892c4..0a5d305 100644
--- a/sys/arm/arm/bootconfig.c
+++ b/sys/arm/arm/bootconfig.c
@@ -1,6 +1,6 @@
 /*	$NetBSD: bootconfig.c,v 1.2 2002/03/10 19:56:39 lukem Exp $	*/
 
-/*
+/*-
  * Copyright (c) 1994-1998 Mark Brinicombe.
  * Copyright (c) 1994 Brini.
  * All rights reserved.
diff --git a/sys/arm/arm/bus_space_asm_generic.S b/sys/arm/arm/bus_space_asm_generic.S
index 4c34537..37c1808 100644
--- a/sys/arm/arm/bus_space_asm_generic.S
+++ b/sys/arm/arm/bus_space_asm_generic.S
@@ -1,6 +1,6 @@
 /*	$NetBSD: bus_space_asm_generic.S,v 1.3 2003/03/27 19:46:14 mycroft Exp $	*/
 
-/*
+/*-
  * Copyright (c) 1997 Causality Limited.
  * Copyright (c) 1997 Mark Brinicombe.
  * All rights reserved.
diff --git a/sys/arm/arm/busdma_machdep.c b/sys/arm/arm/busdma_machdep.c
index f5c1392..03f211a 100644
--- a/sys/arm/arm/busdma_machdep.c
+++ b/sys/arm/arm/busdma_machdep.c
@@ -1,4 +1,4 @@
-/*
+/*-
  * Copyright (c) 2004 Olivier Houchard
  * Copyright (c) 2002 Peter Grehan
  * Copyright (c) 1997, 1998 Justin T. Gibbs.
diff --git a/sys/arm/arm/copystr.S b/sys/arm/arm/copystr.S
index 7c91cfa..13bbf01 100644
--- a/sys/arm/arm/copystr.S
+++ b/sys/arm/arm/copystr.S
@@ -1,6 +1,6 @@
 /*	$NetBSD: copystr.S,v 1.8 2002/10/13 14:54:48 bjh21 Exp $	*/
 
-/*
+/*-
  * Copyright (c) 1995 Mark Brinicombe.
  * All rights reserved.
  *
diff --git a/sys/arm/arm/cpufunc.c b/sys/arm/arm/cpufunc.c
index 56b9e2a..fcac9d0 100644
--- a/sys/arm/arm/cpufunc.c
+++ b/sys/arm/arm/cpufunc.c
@@ -1,6 +1,6 @@
 /*	$NetBSD: cpufunc.c,v 1.65 2003/11/05 12:53:15 scw Exp $	*/
 
-/*
+/*-
  * arm7tdmi support code Copyright (c) 2001 John Fremlin
  * arm8 support code Copyright (c) 1997 ARM Limited
  * arm8 support code Copyright (c) 1997 Causality Limited
diff --git a/sys/arm/arm/cpufunc_asm.S b/sys/arm/arm/cpufunc_asm.S
index fa634af..5cd5f37 100644
--- a/sys/arm/arm/cpufunc_asm.S
+++ b/sys/arm/arm/cpufunc_asm.S
@@ -1,6 +1,6 @@
 /*	$NetBSD: cpufunc_asm.S,v 1.12 2003/09/06 09:14:52 rearnsha Exp $	*/
 
-/*
+/*-
  * Copyright (c) 1997,1998 Mark Brinicombe.
  * Copyright (c) 1997 Causality Limited
  * All rights reserved.
diff --git a/sys/arm/arm/cpufunc_asm_arm10.S b/sys/arm/arm/cpufunc_asm_arm10.S
index 2c00812..d1d55ff 100644
--- a/sys/arm/arm/cpufunc_asm_arm10.S
+++ b/sys/arm/arm/cpufunc_asm_arm10.S
@@ -1,6 +1,6 @@
 /*	$NetBSD: cpufunc_asm_arm10.S,v 1.1 2003/09/06 09:12:29 rearnsha Exp $	*/
 
-/*
+/*-
  * Copyright (c) 2002 ARM Limited
  * All rights reserved.
  *
diff --git a/sys/arm/arm/cpufunc_asm_arm3.S b/sys/arm/arm/cpufunc_asm_arm3.S
index dd1558c..10f706e 100644
--- a/sys/arm/arm/cpufunc_asm_arm3.S
+++ b/sys/arm/arm/cpufunc_asm_arm3.S
@@ -1,6 +1,6 @@
 /*	$NetBSD: cpufunc_asm_arm3.S,v 1.1 2001/11/10 23:14:09 thorpej Exp $	*/
 
-/*
+/*-
  * Copyright (c) 1997,1998 Mark Brinicombe.
  * Copyright (c) 1997 Causality Limited
  * All rights reserved.
diff --git a/sys/arm/arm/cpufunc_asm_arm67.S b/sys/arm/arm/cpufunc_asm_arm67.S
index 08107b1..e56254b 100644
--- a/sys/arm/arm/cpufunc_asm_arm67.S
+++ b/sys/arm/arm/cpufunc_asm_arm67.S
@@ -1,6 +1,6 @@
 /*	$NetBSD: cpufunc_asm_arm67.S,v 1.1 2001/11/10 23:14:09 thorpej Exp $	*/
 
-/*
+/*-
  * Copyright (c) 1997,1998 Mark Brinicombe.
  * Copyright (c) 1997 Causality Limited
  * All rights reserved.
diff --git a/sys/arm/arm/cpufunc_asm_arm7tdmi.S b/sys/arm/arm/cpufunc_asm_arm7tdmi.S
index a55d323..d301efc 100644
--- a/sys/arm/arm/cpufunc_asm_arm7tdmi.S
+++ b/sys/arm/arm/cpufunc_asm_arm7tdmi.S
@@ -1,6 +1,6 @@
 /*	$NetBSD: cpufunc_asm_arm7tdmi.S,v 1.1 2001/11/10 23:14:09 thorpej Exp $	*/
 
-/*
+/*-
  * Copyright (c) 2001 John Fremlin
  * All rights reserved.
  *
diff --git a/sys/arm/arm/cpufunc_asm_arm8.S b/sys/arm/arm/cpufunc_asm_arm8.S
index aeff06b..febe8f0 100644
--- a/sys/arm/arm/cpufunc_asm_arm8.S
+++ b/sys/arm/arm/cpufunc_asm_arm8.S
@@ -1,6 +1,6 @@
 /*	$NetBSD: cpufunc_asm_arm8.S,v 1.2 2001/11/11 00:47:49 thorpej Exp $	*/
 
-/*
+/*-
  * Copyright (c) 1997 ARM Limited
  * Copyright (c) 1997 Causality Limited
  * All rights reserved.
diff --git a/sys/arm/arm/cpufunc_asm_arm9.S b/sys/arm/arm/cpufunc_asm_arm9.S
index 958a32d..d2f4904 100644
--- a/sys/arm/arm/cpufunc_asm_arm9.S
+++ b/sys/arm/arm/cpufunc_asm_arm9.S
@@ -1,6 +1,6 @@
 /*	$NetBSD: cpufunc_asm_arm9.S,v 1.2 2002/01/29 15:27:29 rearnsha Exp $	*/
 
-/*
+/*-
  * Copyright (c) 2001 ARM Limited
  * All rights reserved.
  *
diff --git a/sys/arm/arm/cpufunc_asm_armv4.S b/sys/arm/arm/cpufunc_asm_armv4.S
index 6914818..ccdcce2 100644
--- a/sys/arm/arm/cpufunc_asm_armv4.S
+++ b/sys/arm/arm/cpufunc_asm_armv4.S
@@ -1,6 +1,6 @@
 /*	$NetBSD: cpufunc_asm_armv4.S,v 1.1 2001/11/10 23:14:09 thorpej Exp $	*/
 
-/*
+/*-
  * Copyright (c) 2001 ARM Limited
  * Copyright (c) 1997,1998 Mark Brinicombe.
  * Copyright (c) 1997 Causality Limited
diff --git a/sys/arm/arm/cpufunc_asm_ixp12x0.S b/sys/arm/arm/cpufunc_asm_ixp12x0.S
index dc20496..efc5950 100644
--- a/sys/arm/arm/cpufunc_asm_ixp12x0.S
+++ b/sys/arm/arm/cpufunc_asm_ixp12x0.S
@@ -1,6 +1,6 @@
 /*	$NetBSD: cpufunc_asm_ixp12x0.S,v 1.2 2002/08/17 16:36:31 thorpej Exp $	*/
 
-/*
+/*-
  * Copyright (c) 2002 Wasabi Systems, Inc.
  * All rights reserved.
  *
diff --git a/sys/arm/arm/cpufunc_asm_sa1.S b/sys/arm/arm/cpufunc_asm_sa1.S
index 6b10ba1..7279e65 100644
--- a/sys/arm/arm/cpufunc_asm_sa1.S
+++ b/sys/arm/arm/cpufunc_asm_sa1.S
@@ -1,6 +1,6 @@
 /*	$NetBSD: cpufunc_asm_sa1.S,v 1.8 2002/08/17 16:36:32 thorpej Exp $	*/
 
-/*
+/*-
  * Copyright (c) 1997,1998 Mark Brinicombe.
  * Copyright (c) 1997 Causality Limited
  * All rights reserved.
diff --git a/sys/arm/arm/cpufunc_asm_sa11x0.S b/sys/arm/arm/cpufunc_asm_sa11x0.S
index a208f6f..ca167c8 100644
--- a/sys/arm/arm/cpufunc_asm_sa11x0.S
+++ b/sys/arm/arm/cpufunc_asm_sa11x0.S
@@ -1,6 +1,6 @@
 /*	$NetBSD: cpufunc_asm_sa11x0.S,v 1.3 2002/08/17 16:36:32 thorpej Exp $	*/
 
-/*
+/*-
  * Copyright (c) 2002 Wasabi Systems, Inc.
  * All rights reserved.
  *
diff --git a/sys/arm/arm/cpufunc_asm_xscale.S b/sys/arm/arm/cpufunc_asm_xscale.S
index 8e9e606..bc02d31 100644
--- a/sys/arm/arm/cpufunc_asm_xscale.S
+++ b/sys/arm/arm/cpufunc_asm_xscale.S
@@ -1,6 +1,6 @@
 /*	$NetBSD: cpufunc_asm_xscale.S,v 1.16 2002/08/17 16:36:32 thorpej Exp $	*/
 
-/*
+/*-
  * Copyright (c) 2001, 2002 Wasabi Systems, Inc.
  * All rights reserved.
  *
@@ -36,7 +36,7 @@
  *
  */
 
-/*
+/*-
  * Copyright (c) 2001 Matt Thomas.
  * Copyright (c) 1997,1998 Mark Brinicombe.
  * Copyright (c) 1997 Causality Limited
diff --git a/sys/arm/arm/db_disasm.c b/sys/arm/arm/db_disasm.c
index d5dfa92..52ff7d7 100644
--- a/sys/arm/arm/db_disasm.c
+++ b/sys/arm/arm/db_disasm.c
@@ -1,6 +1,6 @@
 /*	$NetBSD: db_disasm.c,v 1.4 2003/07/15 00:24:38 lukem Exp $	*/
 
-/*
+/*-
  * Copyright (c) 1996 Mark Brinicombe.
  * Copyright (c) 1996 Brini.
  *
diff --git a/sys/arm/arm/db_interface.c b/sys/arm/arm/db_interface.c
index 8832097..2788ca2 100644
--- a/sys/arm/arm/db_interface.c
+++ b/sys/arm/arm/db_interface.c
@@ -1,6 +1,6 @@
 /*	$NetBSD: db_interface.c,v 1.33 2003/08/25 04:51:10 mrg Exp $	*/
 
-/* 
+/*-
  * Copyright (c) 1996 Scott K. Stevens
  *
  * Mach Operating System
diff --git a/sys/arm/arm/db_trace.c b/sys/arm/arm/db_trace.c
index 45e1892..869713a 100644
--- a/sys/arm/arm/db_trace.c
+++ b/sys/arm/arm/db_trace.c
@@ -1,6 +1,6 @@
 /*	$NetBSD: db_trace.c,v 1.8 2003/01/17 22:28:48 thorpej Exp $	*/
 
-/* 
+/*-
  * Copyright (c) 2000, 2001 Ben Harris
  * Copyright (c) 1996 Scott K. Stevens
  *
diff --git a/sys/arm/arm/disassem.c b/sys/arm/arm/disassem.c
index 02f766e..9aa63d8 100644
--- a/sys/arm/arm/disassem.c
+++ b/sys/arm/arm/disassem.c
@@ -1,6 +1,6 @@
 /*	$NetBSD: disassem.c,v 1.14 2003/03/27 16:58:36 mycroft Exp $	*/
 
-/*
+/*-
  * Copyright (c) 1996 Mark Brinicombe.
  * Copyright (c) 1996 Brini.
  *
diff --git a/sys/arm/arm/exception.S b/sys/arm/arm/exception.S
index d914e59..0d21fb4 100644
--- a/sys/arm/arm/exception.S
+++ b/sys/arm/arm/exception.S
@@ -1,6 +1,6 @@
 /*	$NetBSD: exception.S,v 1.13 2003/10/31 16:30:15 scw Exp $	*/
 
-/*
+/*-
  * Copyright (c) 1994-1997 Mark Brinicombe.
  * Copyright (c) 1994 Brini.
  * All rights reserved.
diff --git a/sys/arm/arm/fiq.c b/sys/arm/arm/fiq.c
index 4cd8d30..46901e13 100644
--- a/sys/arm/arm/fiq.c
+++ b/sys/arm/arm/fiq.c
@@ -1,6 +1,6 @@
 /*	$NetBSD: fiq.c,v 1.5 2002/04/03 23:33:27 thorpej Exp $	*/
 
-/*
+/*-
  * Copyright (c) 2001, 2002 Wasabi Systems, Inc.
  * All rights reserved.
  *
diff --git a/sys/arm/arm/fiq_subr.S b/sys/arm/arm/fiq_subr.S
index d86e97f..4cde665 100644
--- a/sys/arm/arm/fiq_subr.S
+++ b/sys/arm/arm/fiq_subr.S
@@ -1,6 +1,6 @@
 /*	$NetBSD: fiq_subr.S,v 1.3 2002/04/12 18:50:31 thorpej Exp $	*/
 
-/*
+/*-
  * Copyright (c) 2001 Wasabi Systems, Inc.
  * All rights reserved.
  *
diff --git a/sys/arm/arm/fusu.S b/sys/arm/arm/fusu.S
index 79be1d5..2fd9547 100644
--- a/sys/arm/arm/fusu.S
+++ b/sys/arm/arm/fusu.S
@@ -1,6 +1,6 @@
 /*	$NetBSD: fusu.S,v 1.10 2003/12/01 13:34:44 rearnsha Exp $	*/
 
-/*
+/*-
  * Copyright (c) 1996-1998 Mark Brinicombe.
  * All rights reserved.
  *
diff --git a/sys/arm/arm/identcpu.c b/sys/arm/arm/identcpu.c
index 9fc6d1d..fff1bae 100644
--- a/sys/arm/arm/identcpu.c
+++ b/sys/arm/arm/identcpu.c
@@ -1,6 +1,6 @@
 /*	$NetBSD: cpu.c,v 1.55 2004/02/13 11:36:10 wiz Exp $	*/
 
-/*
+/*-
  * Copyright (c) 1995 Mark Brinicombe.
  * Copyright (c) 1995 Brini.
  * All rights reserved.
diff --git a/sys/arm/arm/in_cksum.c b/sys/arm/arm/in_cksum.c
index 13f252c..90e6c2b 100644
--- a/sys/arm/arm/in_cksum.c
+++ b/sys/arm/arm/in_cksum.c
@@ -1,6 +1,6 @@
 /* $NetBSD: in_cksum.c,v 1.7 1997/09/02 13:18:15 thorpej Exp $ */
 
-/*
+/*-
  * Copyright (c) 1988, 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
  * Copyright (c) 1996
diff --git a/sys/arm/arm/in_cksum_arm.S b/sys/arm/arm/in_cksum_arm.S
index 09233be..5136626 100644
--- a/sys/arm/arm/in_cksum_arm.S
+++ b/sys/arm/arm/in_cksum_arm.S
@@ -1,6 +1,6 @@
 /*	$NetBSD: in_cksum_arm.S,v 1.2 2003/09/23 10:01:36 scw Exp $	*/
 
-/*
+/*-
  * Copyright 2003 Wasabi Systems, Inc.
  * All rights reserved.
  *
diff --git a/sys/arm/arm/intr.c b/sys/arm/arm/intr.c
index 56a40b7..eeb182f 100644
--- a/sys/arm/arm/intr.c
+++ b/sys/arm/arm/intr.c
@@ -1,6 +1,6 @@
 /*	$NetBSD: intr.c,v 1.12 2003/07/15 00:24:41 lukem Exp $	*/
 
-/*
+/*-
  * Copyright (c) 2004 Olivier Houchard.
  * Copyright (c) 1994-1998 Mark Brinicombe.
  * All rights reserved.
diff --git a/sys/arm/arm/irq_dispatch.S b/sys/arm/arm/irq_dispatch.S
index 21976b9..8624717 100644
--- a/sys/arm/arm/irq_dispatch.S
+++ b/sys/arm/arm/irq_dispatch.S
@@ -1,6 +1,6 @@
 /*	$NetBSD: irq_dispatch.S,v 1.5 2003/10/30 08:57:24 scw Exp $	*/
 
-/*
+/*-
  * Copyright (c) 2002 Fujitsu Component Limited
  * Copyright (c) 2002 Genetec Corporation
  * All rights reserved.
@@ -33,7 +33,7 @@
  *
  */
 
-/*
+/*-
  * Copyright (c) 2002, 2003 Wasabi Systems, Inc.
  * All rights reserved.
  *
diff --git a/sys/arm/arm/locore.S b/sys/arm/arm/locore.S
index 390e940..72649f4 100644
--- a/sys/arm/arm/locore.S
+++ b/sys/arm/arm/locore.S
@@ -1,6 +1,6 @@
 /*	$NetBSD: locore.S,v 1.14 2003/04/20 16:21:40 thorpej Exp $	*/
 
-/*
+/*-
  * Copyright (C) 1994-1997 Mark Brinicombe
  * Copyright (C) 1994 Brini
  * All rights reserved.
diff --git a/sys/arm/arm/machdep.c b/sys/arm/arm/machdep.c
index d51df77..c9d78e7 100644
--- a/sys/arm/arm/machdep.c
+++ b/sys/arm/arm/machdep.c
@@ -1,6 +1,6 @@
 /*	$NetBSD: arm32_machdep.c,v 1.44 2004/03/24 15:34:47 atatat Exp $	*/
 
-/*
+/*-
  * Copyright (c) 2004 Olivier Houchard
  * Copyright (c) 1994-1998 Mark Brinicombe.
  * Copyright (c) 1994 Brini.
diff --git a/sys/arm/arm/nexus.c b/sys/arm/arm/nexus.c
index 59f9679..dd47101 100644
--- a/sys/arm/arm/nexus.c
+++ b/sys/arm/arm/nexus.c
@@ -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/arm/nexus_io.c b/sys/arm/arm/nexus_io.c
index 74f44cf..61f8e4e 100644
--- a/sys/arm/arm/nexus_io.c
+++ b/sys/arm/arm/nexus_io.c
@@ -1,6 +1,6 @@
 /*	$NetBSD: mainbus_io.c,v 1.13 2003/07/15 00:24:47 lukem Exp $	*/
 
-/*
+/*-
  * Copyright (c) 1997 Mark Brinicombe.
  * All rights reserved.
  *
diff --git a/sys/arm/arm/nexus_io_asm.S b/sys/arm/arm/nexus_io_asm.S
index 1b5a166..db9caf6 100644
--- a/sys/arm/arm/nexus_io_asm.S
+++ b/sys/arm/arm/nexus_io_asm.S
@@ -1,6 +1,6 @@
 /*	$NetBSD: mainbus_io_asm.S,v 1.1 2001/02/24 19:38:02 reinoud Exp $	*/
 
-/*
+/*-
  * Copyright (c) 1997 Mark Brinicombe.
  * All rights reserved.
  *
diff --git a/sys/arm/arm/pmap.c b/sys/arm/arm/pmap.c
index f4585e3..8c65847 100644
--- a/sys/arm/arm/pmap.c
+++ b/sys/arm/arm/pmap.c
@@ -1,5 +1,5 @@
 /* From: $NetBSD: pmap.c,v 1.148 2004/04/03 04:35:48 bsh Exp $ */
-/*
+/*-
  * Copyright 2004 Olivier Houchard.
  * Copyright 2003 Wasabi Systems, Inc.
  * All rights reserved.
@@ -35,7 +35,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-/*
+/*-
  * Copyright (c) 2002-2003 Wasabi Systems, Inc.
  * Copyright (c) 2001 Richard Earnshaw
  * Copyright (c) 2001-2002 Christopher Gilbert
@@ -98,11 +98,11 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-/*
+/*-
  * Copyright (c) 1994-1998 Mark Brinicombe.
  * Copyright (c) 1994 Brini.
  * All rights reserved.
-  *
+ *
  * This code is derived from software written for Brini by Mark Brinicombe
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/sys/arm/arm/setcpsr.S b/sys/arm/arm/setcpsr.S
index f2385b9..4597d53 100644
--- a/sys/arm/arm/setcpsr.S
+++ b/sys/arm/arm/setcpsr.S
@@ -1,6 +1,6 @@
 /*	$NetBSD: setcpsr.S,v 1.2 2002/08/15 01:37:02 briggs Exp $	*/
 
-/*
+/*-
  * Copyright (c) 1994 Mark Brinicombe.
  * Copyright (c) 1994 Brini.
  * All rights reserved.
diff --git a/sys/arm/arm/setstack.s b/sys/arm/arm/setstack.s
index dc754d5..f6d412e 100644
--- a/sys/arm/arm/setstack.s
+++ b/sys/arm/arm/setstack.s
@@ -1,6 +1,6 @@
 /*	$NetBSD: setstack.S,v 1.1 2001/07/28 13:28:03 chris Exp $	*/
 
-/*
+/*-
  * Copyright (c) 1994 Mark Brinicombe.
  * Copyright (c) 1994 Brini.
  * All rights reserved.
diff --git a/sys/arm/arm/swtch.S b/sys/arm/arm/swtch.S
index 275a486..2bf7889 100644
--- a/sys/arm/arm/swtch.S
+++ b/sys/arm/arm/swtch.S
@@ -1,6 +1,6 @@
 /*	$NetBSD: cpuswitch.S,v 1.41 2003/11/15 08:44:18 scw Exp $	*/
 
-/*
+/*-
  * Copyright 2003 Wasabi Systems, Inc.
  * All rights reserved.
  *
@@ -34,7 +34,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-/*
+/*-
  * Copyright (c) 1994-1998 Mark Brinicombe.
  * Copyright (c) 1994 Brini.
  * All rights reserved.
diff --git a/sys/arm/arm/trap.c b/sys/arm/arm/trap.c
index 9087eb7..344a4a6 100644
--- a/sys/arm/arm/trap.c
+++ b/sys/arm/arm/trap.c
@@ -1,6 +1,6 @@
 /*	$NetBSD: fault.c,v 1.45 2003/11/20 14:44:36 scw Exp $	*/
 
-/*
+/*-
  * Copyright 2004 Olivier Houchard
  * Copyright 2003 Wasabi Systems, Inc.
  * All rights reserved.
@@ -35,7 +35,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-/*
+/*-
  * Copyright (c) 1994-1997 Mark Brinicombe.
  * Copyright (c) 1994 Brini.
  * All rights reserved.
diff --git a/sys/arm/arm/uio_machdep.c b/sys/arm/arm/uio_machdep.c
index 865118c..ef6fa42 100644
--- a/sys/arm/arm/uio_machdep.c
+++ b/sys/arm/arm/uio_machdep.c
@@ -1,4 +1,4 @@
-/*
+/*-
  * Copyright (c) 2004 Alan L. Cox <alc@cs.rice.edu>
  * Copyright (c) 1982, 1986, 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
diff --git a/sys/arm/arm/undefined.c b/sys/arm/arm/undefined.c
index 260231a..6b99baf 100644
--- a/sys/arm/arm/undefined.c
+++ b/sys/arm/arm/undefined.c
@@ -1,6 +1,6 @@
 /*	$NetBSD: undefined.c,v 1.22 2003/11/29 22:21:29 bjh21 Exp $	*/
 
-/*
+/*-
  * Copyright (c) 2001 Ben Harris.
  * Copyright (c) 1995 Mark Brinicombe.
  * Copyright (c) 1995 Brini.
diff --git a/sys/arm/arm/vectors.S b/sys/arm/arm/vectors.S
index 2947a44..c91b437 100644
--- a/sys/arm/arm/vectors.S
+++ b/sys/arm/arm/vectors.S
@@ -1,6 +1,6 @@
 /*	$NetBSD: vectors.S,v 1.4 2002/08/17 16:36:32 thorpej Exp $	*/
 
-/*
+/*-
  * Copyright (C) 1994-1997 Mark Brinicombe
  * Copyright (C) 1994 Brini
  * All rights reserved. 
diff --git a/sys/arm/arm/vm_machdep.c b/sys/arm/arm/vm_machdep.c
index 40a5ce1..586e220 100644
--- a/sys/arm/arm/vm_machdep.c
+++ b/sys/arm/arm/vm_machdep.c
@@ -38,46 +38,6 @@
  *
  *	from: @(#)vm_machdep.c	7.3 (Berkeley) 5/13/91
  *	Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$
- *//*-
- * Copyright (c) 1982, 1986 The Regents of the University of California.
- * Copyright (c) 1989, 1990 William Jolitz
- * Copyright (c) 1994 John Dyson
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * the Systems Programming Group of the University of Utah Computer
- * Science Department, and William Jolitz.
- *
- * 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 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.
- *
- *	from: @(#)vm_machdep.c	7.3 (Berkeley) 5/13/91
- *	Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$
  */
 
 #include <sys/cdefs.h>
diff --git a/sys/arm/include/_limits.h b/sys/arm/include/_limits.h
index 2d6c7bd..25616e5 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 001c997..489a8ed 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 db8b825..a1a0c43 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 4b1aab3..bf5795c 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 ec1fd9f..2eaa066 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 4745ee2..04467a0 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 5374507..bd7dc61 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 f27ce00..2441000 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 06a996b..aba61df 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 298c985..cd077ab 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 d1b5786..9a7e70b 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 0682311..ae7de16 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 05fdb89..5268755 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 ad666fe..d3c4c98 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 afa3b12..dca62d2 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 acc1ed8..ccb29a8 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 21761ec..424fb7c 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 0626733..ada7203 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 74faa5b4..4d70c20 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 568bae3..a7411dd 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 0d08686..8fc9811 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 f0ccf88..15f853d 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 b449511..ef69fe3 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 0adf7e1..9d933d6 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 b7810fd..8e3bb11 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 32497a4..84e6f87 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 02f7ee4..4a5f330 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 2080da3..cc4eeda 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 5d72258..f7e78ae 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 ae80795..81781bc 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 7ee8e91..c86ddb8 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 bb662da..58149ef 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 783a1c4..229d14f 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 2a21bfa..e906fa1 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 d4f0834..abc5188 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 128fb33..cf8aef5 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 fef56ea..858ed23 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 8ff3f18..6a8a6d7 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 4a0a136..9460f70 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 fda8b67..d43082c 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.
  *
diff --git a/sys/arm/sa11x0/assabet_machdep.c b/sys/arm/sa11x0/assabet_machdep.c
index 9ab80fc..40354f7 100644
--- a/sys/arm/sa11x0/assabet_machdep.c
+++ b/sys/arm/sa11x0/assabet_machdep.c
@@ -1,6 +1,6 @@
 /*	$NetBSD: hpc_machdep.c,v 1.70 2003/09/16 08:18:22 agc Exp $	*/
 
-/*
+/*-
  * Copyright (c) 1994-1998 Mark Brinicombe.
  * Copyright (c) 1994 Brini.
  * All rights reserved.
diff --git a/sys/arm/sa11x0/sa11x0_io.c b/sys/arm/sa11x0/sa11x0_io.c
index bffdb86..98a3ad5 100644
--- a/sys/arm/sa11x0/sa11x0_io.c
+++ b/sys/arm/sa11x0/sa11x0_io.c
@@ -1,6 +1,6 @@
 /*	$NetBSD: sa11x0_io.c,v 1.12 2003/07/15 00:24:51 lukem Exp $	*/
 
-/*
+/*-
  * Copyright (c) 1997 Mark Brinicombe.
  * Copyright (c) 1997 Causality Limited.
  * All rights reserved.
diff --git a/sys/arm/sa11x0/sa11x0_io_asm.S b/sys/arm/sa11x0/sa11x0_io_asm.S
index cb15cd0..7a821f3 100644
--- a/sys/arm/sa11x0/sa11x0_io_asm.S
+++ b/sys/arm/sa11x0/sa11x0_io_asm.S
@@ -1,6 +1,6 @@
 /*	$NetBSD: sa11x0_io_asm.S,v 1.1 2001/07/08 23:37:53 rjs Exp $	*/
 
-/*
+/*-
  * Copyright (c) 1997 Mark Brinicombe.
  * Copyright (c) 1997 Causality Limited.
  * All rights reserved.
diff --git a/sys/arm/sa11x0/sa11x0_irq.S b/sys/arm/sa11x0/sa11x0_irq.S
index 8f85012..3b6d23e 100644
--- a/sys/arm/sa11x0/sa11x0_irq.S
+++ b/sys/arm/sa11x0/sa11x0_irq.S
@@ -1,6 +1,6 @@
 /*	$NetBSD: sa11x0_irq.S,v 1.5 2003/03/31 19:52:35 chris Exp $	*/
 
-/*
+/*-
  * Copyright (c) 1998 Mark Brinicombe.
  * Copyright (c) 1998 Causality Limited
  * All rights reserved.
diff --git a/sys/arm/sa11x0/sa11x0_ost.c b/sys/arm/sa11x0/sa11x0_ost.c
index 28a032a..25241af 100644
--- a/sys/arm/sa11x0/sa11x0_ost.c
+++ b/sys/arm/sa11x0/sa11x0_ost.c
@@ -1,6 +1,6 @@
 /*	$NetBSD: sa11x0_ost.c,v 1.11 2003/07/15 00:24:51 lukem Exp $	*/
 
-/*
+/*-
  * Copyright (c) 1997 Mark Brinicombe.
  * Copyright (c) 1997 Causality Limited.
  * All rights reserved.
diff --git a/sys/arm/sa11x0/uart_bus_sa1110.c b/sys/arm/sa11x0/uart_bus_sa1110.c
index fd4b164..fb8b0d6 100644
--- a/sys/arm/sa11x0/uart_bus_sa1110.c
+++ b/sys/arm/sa11x0/uart_bus_sa1110.c
@@ -1,4 +1,4 @@
-/*
+/*-
  * Copyright (c) 2004 Olivier Houchard.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/sys/arm/sa11x0/uart_cpu_sa1110.c b/sys/arm/sa11x0/uart_cpu_sa1110.c
index 82054cd..ef0cf6a 100644
--- a/sys/arm/sa11x0/uart_cpu_sa1110.c
+++ b/sys/arm/sa11x0/uart_cpu_sa1110.c
@@ -1,4 +1,4 @@
-/*
+/*-
  * Copyright (c) 2003 Marcel Moolenaar
  * All rights reserved.
  *
diff --git a/sys/arm/sa11x0/uart_dev_sa1110.c b/sys/arm/sa11x0/uart_dev_sa1110.c
index 0060252..e1ba5fe 100644
--- a/sys/arm/sa11x0/uart_dev_sa1110.c
+++ b/sys/arm/sa11x0/uart_dev_sa1110.c
@@ -1,4 +1,4 @@
-/*
+/*-
  * Copyright (c) 2003 Marcel Moolenaar
  * All rights reserved.
  *
diff --git a/sys/arm/sa11x0/uart_dev_sa1110.h b/sys/arm/sa11x0/uart_dev_sa1110.h
index cbed96d..29610b2 100644
--- a/sys/arm/sa11x0/uart_dev_sa1110.h
+++ b/sys/arm/sa11x0/uart_dev_sa1110.h
@@ -1,4 +1,4 @@
-/*
+/*-
  * Copyright (c) 2003 Marcel Moolenaar
  * All rights reserved.
  *
diff --git a/sys/arm/xscale/i80321/i80321.c b/sys/arm/xscale/i80321/i80321.c
index 5e45c34..b468c36f 100644
--- a/sys/arm/xscale/i80321/i80321.c
+++ b/sys/arm/xscale/i80321/i80321.c
@@ -1,6 +1,6 @@
 /*	$NetBSD: i80321.c,v 1.15 2003/10/06 16:06:05 thorpej Exp $	*/
 
-/*
+/*-
  * Copyright (c) 2002 Wasabi Systems, Inc.
  * All rights reserved.
  *
diff --git a/sys/arm/xscale/i80321/i80321_intr.h b/sys/arm/xscale/i80321/i80321_intr.h
index affbf53..5f777ce 100644
--- a/sys/arm/xscale/i80321/i80321_intr.h
+++ b/sys/arm/xscale/i80321/i80321_intr.h
@@ -1,6 +1,6 @@
 /*	$NetBSD: i80321_intr.h,v 1.5 2004/01/12 10:25:06 scw Exp $	*/
 
-/*
+/*-
  * Copyright (c) 2001, 2002 Wasabi Systems, Inc.
  * All rights reserved.
  *
diff --git a/sys/arm/xscale/i80321/i80321_mcu.c b/sys/arm/xscale/i80321/i80321_mcu.c
index d073f25..a51a433 100644
--- a/sys/arm/xscale/i80321/i80321_mcu.c
+++ b/sys/arm/xscale/i80321/i80321_mcu.c
@@ -1,6 +1,6 @@
 /*	$NetBSD: i80321_mcu.c,v 1.2 2003/07/15 00:24:54 lukem Exp $	*/
 
-/*
+/*-
  * Copyright (c) 2001, 2002 Wasabi Systems, Inc.
  * All rights reserved.
  *
diff --git a/sys/arm/xscale/i80321/i80321_pci.c b/sys/arm/xscale/i80321/i80321_pci.c
index 41582b4..0bb7810 100644
--- a/sys/arm/xscale/i80321/i80321_pci.c
+++ b/sys/arm/xscale/i80321/i80321_pci.c
@@ -1,6 +1,6 @@
 /*	$NetBSD: i80321_pci.c,v 1.4 2003/07/15 00:24:54 lukem Exp $	*/
 
-/*
+/*-
  * Copyright (c) 2001, 2002 Wasabi Systems, Inc.
  * All rights reserved.
  *
diff --git a/sys/arm/xscale/i80321/i80321_space.c b/sys/arm/xscale/i80321/i80321_space.c
index cd4cd31..a18743a 100644
--- a/sys/arm/xscale/i80321/i80321_space.c
+++ b/sys/arm/xscale/i80321/i80321_space.c
@@ -1,6 +1,6 @@
 /*	$NetBSD: i80321_space.c,v 1.6 2003/10/06 15:43:35 thorpej Exp $	*/
 
-/*
+/*-
  * Copyright (c) 2001, 2002 Wasabi Systems, Inc.
  * All rights reserved.
  *
diff --git a/sys/arm/xscale/i80321/i80321_timer.c b/sys/arm/xscale/i80321/i80321_timer.c
index 152a0ef..84722e3 100644
--- a/sys/arm/xscale/i80321/i80321_timer.c
+++ b/sys/arm/xscale/i80321/i80321_timer.c
@@ -1,6 +1,6 @@
 /*	$NetBSD: i80321_timer.c,v 1.7 2003/07/27 04:52:28 thorpej Exp $	*/
 
-/*
+/*-
  * Copyright (c) 2001, 2002 Wasabi Systems, Inc.
  * All rights reserved.
  *
diff --git a/sys/arm/xscale/i80321/i80321reg.h b/sys/arm/xscale/i80321/i80321reg.h
index 64b30d8..19092da 100644
--- a/sys/arm/xscale/i80321/i80321reg.h
+++ b/sys/arm/xscale/i80321/i80321reg.h
@@ -1,6 +1,6 @@
 /*	$NetBSD: i80321reg.h,v 1.14 2003/12/19 10:08:11 gavan Exp $	*/
 
-/*
+/*-
  * Copyright (c) 2002 Wasabi Systems, Inc.
  * All rights reserved.
  *
diff --git a/sys/arm/xscale/i80321/i80321var.h b/sys/arm/xscale/i80321/i80321var.h
index 8fe4c4d..fef194b 100644
--- a/sys/arm/xscale/i80321/i80321var.h
+++ b/sys/arm/xscale/i80321/i80321var.h
@@ -1,6 +1,6 @@
 /*	$NetBSD: i80321var.h,v 1.8 2003/10/06 16:06:06 thorpej Exp $	*/
 
-/*
+/*-
  * Copyright (c) 2002, 2003 Wasabi Systems, Inc.
  * All rights reserved.
  *
diff --git a/sys/arm/xscale/i80321/iq31244_machdep.c b/sys/arm/xscale/i80321/iq31244_machdep.c
index a6dc1d3..89143dc 100644
--- a/sys/arm/xscale/i80321/iq31244_machdep.c
+++ b/sys/arm/xscale/i80321/iq31244_machdep.c
@@ -1,6 +1,6 @@
 /*	$NetBSD: hpc_machdep.c,v 1.70 2003/09/16 08:18:22 agc Exp $	*/
 
-/*
+/*-
  * Copyright (c) 1994-1998 Mark Brinicombe.
  * Copyright (c) 1994 Brini.
  * All rights reserved.
diff --git a/sys/arm/xscale/i80321/iq80321.c b/sys/arm/xscale/i80321/iq80321.c
index d8ae49b..bd202e0 100644
--- a/sys/arm/xscale/i80321/iq80321.c
+++ b/sys/arm/xscale/i80321/iq80321.c
@@ -1,6 +1,6 @@
 /*	$NetBSD: i80321_mainbus.c,v 1.13 2003/12/17 22:03:24 abs Exp $	*/
 
-/*
+/*-
  * Copyright (c) 2001, 2002 Wasabi Systems, Inc.
  * All rights reserved.
  *
diff --git a/sys/arm/xscale/i80321/iq80321reg.h b/sys/arm/xscale/i80321/iq80321reg.h
index 1750143..1e518eb 100644
--- a/sys/arm/xscale/i80321/iq80321reg.h
+++ b/sys/arm/xscale/i80321/iq80321reg.h
@@ -1,6 +1,6 @@
 /*	$NetBSD: iq80321reg.h,v 1.4 2003/05/14 19:46:39 thorpej Exp $	*/
 
-/*
+/*-
  * Copyright (c) 2002 Wasabi Systems, Inc.
  * All rights reserved.
  *
diff --git a/sys/arm/xscale/i80321/iq80321var.h b/sys/arm/xscale/i80321/iq80321var.h
index 1bce5ed..4a03500 100644
--- a/sys/arm/xscale/i80321/iq80321var.h
+++ b/sys/arm/xscale/i80321/iq80321var.h
@@ -1,6 +1,6 @@
 /*	$NetBSD: iq80321var.h,v 1.1 2002/03/27 21:51:30 thorpej Exp $	*/
 
-/*
+/*-
  * Copyright (c) 2002 Wasabi Systems, Inc.
  * All rights reserved.
  *
diff --git a/sys/arm/xscale/i80321/obio.c b/sys/arm/xscale/i80321/obio.c
index e3f7e7e..523f14e 100644
--- a/sys/arm/xscale/i80321/obio.c
+++ b/sys/arm/xscale/i80321/obio.c
@@ -1,6 +1,6 @@
 /*	$NetBSD: obio.c,v 1.11 2003/07/15 00:25:05 lukem Exp $	*/
 
-/*
+/*-
  * Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
  * All rights reserved.
  *
diff --git a/sys/arm/xscale/i80321/obio_space.c b/sys/arm/xscale/i80321/obio_space.c
index 4691b04..a503bfa 100644
--- a/sys/arm/xscale/i80321/obio_space.c
+++ b/sys/arm/xscale/i80321/obio_space.c
@@ -1,6 +1,6 @@
 /*	$NetBSD: obio_space.c,v 1.6 2003/07/15 00:25:05 lukem Exp $	*/
 
-/*
+/*-
  * Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
  * All rights reserved.
  *
diff --git a/sys/arm/xscale/i80321/obiovar.h b/sys/arm/xscale/i80321/obiovar.h
index a5d43b0..8d8c5c5 100644
--- a/sys/arm/xscale/i80321/obiovar.h
+++ b/sys/arm/xscale/i80321/obiovar.h
@@ -1,6 +1,6 @@
 /*	$NetBSD: obiovar.h,v 1.4 2003/06/16 17:40:53 thorpej Exp $	*/
 
-/*
+/*-
  * Copyright (c) 2002, 2003 Wasabi Systems, Inc.
  * All rights reserved.
  *
diff --git a/sys/arm/xscale/i80321/uart_bus_i80321.c b/sys/arm/xscale/i80321/uart_bus_i80321.c
index 3c61c73..5bb903d 100644
--- a/sys/arm/xscale/i80321/uart_bus_i80321.c
+++ b/sys/arm/xscale/i80321/uart_bus_i80321.c
@@ -1,4 +1,4 @@
-/*
+/*-
  * Copyright (c) 2004 Olivier Houchard.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/sys/arm/xscale/i80321/uart_cpu_i80321.c b/sys/arm/xscale/i80321/uart_cpu_i80321.c
index 6281d48..0327318 100644
--- a/sys/arm/xscale/i80321/uart_cpu_i80321.c
+++ b/sys/arm/xscale/i80321/uart_cpu_i80321.c
@@ -1,4 +1,4 @@
-/*
+/*-
  * Copyright (c) 2003 Marcel Moolenaar
  * All rights reserved.
  *
diff --git a/sys/arm/xscale/xscalereg.h b/sys/arm/xscale/xscalereg.h
index 6af75e5..85e64d1 100644
--- a/sys/arm/xscale/xscalereg.h
+++ b/sys/arm/xscale/xscalereg.h
@@ -1,6 +1,6 @@
 /*	$NetBSD: xscalereg.h,v 1.2 2002/08/07 05:15:02 briggs Exp $	*/
 
-/*
+/*-
  * Copyright (c) 2001 Wasabi Systems, Inc.
  * All rights reserved.
  *
diff --git a/sys/arm/xscale/xscalevar.h b/sys/arm/xscale/xscalevar.h
index b3c70b8..32a510f 100644
--- a/sys/arm/xscale/xscalevar.h
+++ b/sys/arm/xscale/xscalevar.h
@@ -1,6 +1,6 @@
 /*	$NetBSD: xscalevar.h,v 1.1 2002/10/08 23:59:41 thorpej Exp $	*/
 
-/*
+/*-
  * Copyright (c) 2002 Wasabi Systems, Inc.
  * All rights reserved.
  *