13 files changed, 39 insertions, 13 deletions
diff --git a/sys/dev/vinum/vinum.c b/sys/dev/vinum/vinum.c
index 36dfa982ed5d..5544cae5975f 100644
--- a/sys/dev/vinum/vinum.c
+++ b/sys/dev/vinum/vinum.c
@@ -36,9 +36,11 @@
  * advised of the possibility of such damage.
  *
  * $Id: vinum.c,v 1.44 2003/05/23 00:50:55 grog Exp grog $
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #define STATIC static					    /* nothing while we're testing */
 
 #include <dev/vinum/vinumhdr.h>
diff --git a/sys/dev/vinum/vinumconfig.c b/sys/dev/vinum/vinumconfig.c
index 2d172e14f868..0d6237c8735f 100644
--- a/sys/dev/vinum/vinumconfig.c
+++ b/sys/dev/vinum/vinumconfig.c
@@ -34,9 +34,11 @@
  * advised of the possibility of such damage.
  *
  * $Id: vinumconfig.c,v 1.41 2003/05/23 00:57:34 grog Exp grog $
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #define STATIC static
 
 #include <dev/vinum/vinumhdr.h>
diff --git a/sys/dev/vinum/vinumdaemon.c b/sys/dev/vinum/vinumdaemon.c
index 3ae09c0d43f0..121357de6654 100644
--- a/sys/dev/vinum/vinumdaemon.c
+++ b/sys/dev/vinum/vinumdaemon.c
@@ -1,4 +1,7 @@
 /* daemon.c: kernel part of Vinum daemon */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 /*-
  * Copyright (c) 1997, 1998
  *	Nan Yang Computer Services Limited.  All rights reserved.
@@ -35,7 +38,6 @@
  * advised of the possibility of such damage.
  *
  * $Id: vinumdaemon.c,v 1.8 2000/01/03 05:22:03 grog Exp grog $
- * $FreeBSD$
  */
 
 #include <dev/vinum/vinumhdr.h>
diff --git a/sys/dev/vinum/vinuminterrupt.c b/sys/dev/vinum/vinuminterrupt.c
index 8d72579af8cf..3221e476668a 100644
--- a/sys/dev/vinum/vinuminterrupt.c
+++ b/sys/dev/vinum/vinuminterrupt.c
@@ -1,5 +1,8 @@
 /* vinuminterrupt.c: bottom half of the driver */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 /*-
  * Copyright (c) 1997, 1998, 1999
  *	Nan Yang Computer Services Limited.  All rights reserved.
@@ -40,7 +43,6 @@
  * advised of the possibility of such damage.
  *
  * $Id: vinuminterrupt.c,v 1.14 2001/05/23 23:03:37 grog Exp grog $
- * $FreeBSD$
  */
 
 #include <dev/vinum/vinumhdr.h>
diff --git a/sys/dev/vinum/vinumioctl.c b/sys/dev/vinum/vinumioctl.c
index 2f7b8766dc15..f38017f89d53 100644
--- a/sys/dev/vinum/vinumioctl.c
+++ b/sys/dev/vinum/vinumioctl.c
@@ -2,6 +2,9 @@
  * XXX replace all the checks on object validity with
  * calls to valid<object>
  */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 /*-
  * Copyright (c) 1997, 1998, 1999
  *	Nan Yang Computer Services Limited.  All rights reserved.
@@ -42,7 +45,6 @@
  * advised of the possibility of such damage.
  *
  * $Id: vinumioctl.c,v 1.23 2003/05/23 01:02:22 grog Exp grog $
- * $FreeBSD$
  */
 
 #include <dev/vinum/vinumhdr.h>
diff --git a/sys/dev/vinum/vinumlock.c b/sys/dev/vinum/vinumlock.c
index 33d957890b77..f1a2ea3103e2 100644
--- a/sys/dev/vinum/vinumlock.c
+++ b/sys/dev/vinum/vinumlock.c
@@ -38,9 +38,11 @@
  * advised of the possibility of such damage.
  *
  * $Id: vinumlock.c,v 1.19 2003/05/23 01:07:18 grog Exp $
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <dev/vinum/vinumhdr.h>
 #include <dev/vinum/request.h>
 
diff --git a/sys/dev/vinum/vinummemory.c b/sys/dev/vinum/vinummemory.c
index b4e9a4376a3d..62c573d550ae 100644
--- a/sys/dev/vinum/vinummemory.c
+++ b/sys/dev/vinum/vinummemory.c
@@ -34,9 +34,11 @@
  * advised of the possibility of such damage.
  *
  * $Id: vinummemory.c,v 1.31 2003/05/23 01:08:36 grog Exp $
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <dev/vinum/vinumhdr.h>
 
 #ifdef VINUMDEBUG
diff --git a/sys/dev/vinum/vinumparser.c b/sys/dev/vinum/vinumparser.c
index 2820ffd51681..49da34b4dec3 100644
--- a/sys/dev/vinum/vinumparser.c
+++ b/sys/dev/vinum/vinumparser.c
@@ -34,9 +34,11 @@
  * advised of the possibility of such damage.
  *
  * $Id: vinumparser.c,v 1.25 2003/05/07 03:33:28 grog Exp grog $
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 /*
  * This file contains the parser for the configuration routines.  It's used
  * both in the kernel and in the user interface program, thus the separate file.
diff --git a/sys/dev/vinum/vinumraid5.c b/sys/dev/vinum/vinumraid5.c
index 73b024f44d97..4bdd64f4c7f8 100644
--- a/sys/dev/vinum/vinumraid5.c
+++ b/sys/dev/vinum/vinumraid5.c
@@ -39,8 +39,10 @@
  * advised of the possibility of such damage.
  *
  * $Id: vinumraid5.c,v 1.23 2003/02/08 03:32:45 grog Exp $
- * $FreeBSD$
  */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 #include <dev/vinum/vinumhdr.h>
 #include <dev/vinum/request.h>
 #include <sys/resourcevar.h>
diff --git a/sys/dev/vinum/vinumrequest.c b/sys/dev/vinum/vinumrequest.c
index f74fc89d2d98..16d2e9326107 100644
--- a/sys/dev/vinum/vinumrequest.c
+++ b/sys/dev/vinum/vinumrequest.c
@@ -38,9 +38,11 @@
  * advised of the possibility of such damage.
  *
  * $Id: vinumrequest.c,v 1.36 2003/05/08 04:34:55 grog Exp grog $
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <dev/vinum/vinumhdr.h>
 #include <dev/vinum/request.h>
 #include <sys/resourcevar.h>
diff --git a/sys/dev/vinum/vinumrevive.c b/sys/dev/vinum/vinumrevive.c
index 03e16f938c65..4d0ce8eae74f 100644
--- a/sys/dev/vinum/vinumrevive.c
+++ b/sys/dev/vinum/vinumrevive.c
@@ -38,9 +38,11 @@
  * advised of the possibility of such damage.
  *
  * $Id: vinumrevive.c,v 1.18 2003/04/28 02:54:43 grog Exp $
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <dev/vinum/vinumhdr.h>
 #include <dev/vinum/request.h>
 
diff --git a/sys/dev/vinum/vinumstate.c b/sys/dev/vinum/vinumstate.c
index 59c9860dd87f..94b45c1507de 100644
--- a/sys/dev/vinum/vinumstate.c
+++ b/sys/dev/vinum/vinumstate.c
@@ -38,9 +38,11 @@
  * advised of the possibility of such damage.
  *
  * $Id: vinumstate.c,v 2.21 2003/04/28 02:54:43 grog Exp $
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <dev/vinum/vinumhdr.h>
 #include <dev/vinum/request.h>
 
diff --git a/sys/dev/vinum/vinumutil.c b/sys/dev/vinum/vinumutil.c
index 5d3fe82e2c02..f597cd72c06c 100644
--- a/sys/dev/vinum/vinumutil.c
+++ b/sys/dev/vinum/vinumutil.c
@@ -36,9 +36,11 @@
  * advised of the possibility of such damage.
  *
  * $Id: vinumutil.c,v 1.17 2003/04/28 02:54:43 grog Exp $
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 /* This file contains utility routines used both in kernel and user context */
 
 #include <dev/vinum/vinumhdr.h>