Clean up the BSD license to match the preferred license in

/usr/share/examples/etc/bsd-style-copyright.  I've fixed a
few minor wording and formatting differences.

Approved by:	luigi, Hannu Savolainen <hannu@opensound.com>

6 files changed, 13 insertions, 17 deletions

diff --git a/sys/dev/sound/isa/ad1816.c b/sys/dev/sound/isa/ad1816.c
index 2b2761f..dace852 100644
--- a/sys/dev/sound/isa/ad1816.c
+++ b/sys/dev/sound/isa/ad1816.c
@@ -1,7 +1,7 @@
 /*-
  * Copyright (c) 1999 Cameron Grant <cg@freebsd.org>
- * Copyright Luigi Rizzo, 1997,1998
- * Copyright by Hannu Savolainen 1994, 1995
+ * Copyright (c) 1997,1998 Luigi Rizzo
+ * Copyright (c) 1994,1995 Hannu Savolainen
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/sound/isa/ess.c b/sys/dev/sound/isa/ess.c
index d83f699..ef44da6 100644
--- a/sys/dev/sound/isa/ess.c
+++ b/sys/dev/sound/isa/ess.c
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 1999 Cameron Grant <cg@freebsd.org>
- * Copyright 1997,1998 Luigi Rizzo.
+ * Copyright (c) 1997,1998 Luigi Rizzo
  *
  * Derived from files in the Voxware 3.5 distribution,
  * Copyright by Hannu Savolainen 1994, under the same copyright
diff --git a/sys/dev/sound/isa/mss.c b/sys/dev/sound/isa/mss.c
index 0500512..ef19b19 100644
--- a/sys/dev/sound/isa/mss.c
+++ b/sys/dev/sound/isa/mss.c
@@ -1,8 +1,8 @@
 /*-
  * Copyright (c) 2001 George Reid <greid@ukug.uk.freebsd.org>
  * Copyright (c) 1999 Cameron Grant <cg@freebsd.org>
- * Copyright Luigi Rizzo, 1997,1998
- * Copyright by Hannu Savolainen 1994, 1995
+ * Copyright (c) 1997,1998 Luigi Rizzo
+ * Copyright (c) 1994,1995 Hannu Savolainen
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/sound/isa/mss.h b/sys/dev/sound/isa/mss.h
index d9247f9..6246442 100644
--- a/sys/dev/sound/isa/mss.h
+++ b/sys/dev/sound/isa/mss.h
@@ -1,15 +1,6 @@
 /*-
- * file: mss.h
- *
- * (C) 1997 Luigi Rizzo (luigi@iet.unipi.it)
- *
- * This file contains information and macro definitions for
- * AD1848-compatible devices, used in the MSS/WSS compatible boards.
- *
- */
-
-/*-
  * Copyright (c) 1999 Doug Rabson
+ * Copyright (c) 1997 Luigi Rizzo (luigi@iet.unipi.it)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -37,6 +28,11 @@
  */
 
 /*
+ * This file contains information and macro definitions for
+ * AD1848-compatible devices, used in the MSS/WSS compatible boards.
+ */
+
+/*
  *
 
 The codec part of the board is seen as a set of 4 registers mapped
diff --git a/sys/dev/sound/isa/sb16.c b/sys/dev/sound/isa/sb16.c
index af19e4a..94e1e88 100644
--- a/sys/dev/sound/isa/sb16.c
+++ b/sys/dev/sound/isa/sb16.c
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 1999 Cameron Grant <cg@freebsd.org>
- * Copyright 1997,1998 Luigi Rizzo.
+ * Copyright (c) 1997,1998 Luigi Rizzo
  *
  * Derived from files in the Voxware 3.5 distribution,
  * Copyright by Hannu Savolainen 1994, under the same copyright
diff --git a/sys/dev/sound/isa/sb8.c b/sys/dev/sound/isa/sb8.c
index e5a2689..ac557e6 100644
--- a/sys/dev/sound/isa/sb8.c
+++ b/sys/dev/sound/isa/sb8.c
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 1999 Cameron Grant <cg@freebsd.org>
- * Copyright 1997,1998 Luigi Rizzo.
+ * Copyright (c) 1997,1998 Luigi Rizzo
  *
  * Derived from files in the Voxware 3.5 distribution,
  * Copyright by Hannu Savolainen 1994, under the same copyright