75 files changed, 75 insertions, 75 deletions

diff --git a/sys/dev/advansys/adv_isa.c b/sys/dev/advansys/adv_isa.c
index e7c89151f762..066836a73500 100644
--- a/sys/dev/advansys/adv_isa.c
+++ b/sys/dev/advansys/adv_isa.c
@@ -40,7 +40,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id$
+ *      $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/advansys/advlib.c b/sys/dev/advansys/advlib.c
index 910786f98d88..f7df66f7ec45 100644
--- a/sys/dev/advansys/advlib.c
+++ b/sys/dev/advansys/advlib.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: advlib.c,v 1.1.1.1 1996/10/07 02:07:06 gibbs Exp $
+ *      $FreeBSD$
  */
 /*
  * Ported from:
diff --git a/sys/dev/advansys/advlib.h b/sys/dev/advansys/advlib.h
index 9e18137c3368..ebb24c390047 100644
--- a/sys/dev/advansys/advlib.h
+++ b/sys/dev/advansys/advlib.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id$
+ *      $FreeBSD$
  */
 /*
  * Ported from:
diff --git a/sys/dev/advansys/advmcode.c b/sys/dev/advansys/advmcode.c
index 37fd53ce80ba..ce23ca0b0228 100644
--- a/sys/dev/advansys/advmcode.c
+++ b/sys/dev/advansys/advmcode.c
@@ -1,7 +1,7 @@
 /*
  * Downloadable microcode for Advanced Systems Inc. SCSI controllers
  *
- *	$Id$
+ *	$FreeBSD$
  *
  * Obtained from:
  * advansys.c - Linux Host Driver for AdvanSys SCSI Adapters
diff --git a/sys/dev/advansys/advmcode.h b/sys/dev/advansys/advmcode.h
index c5688e579cf5..37d4bc90a49c 100644
--- a/sys/dev/advansys/advmcode.h
+++ b/sys/dev/advansys/advmcode.h
@@ -1,7 +1,7 @@
 /*
  * Exported interface to downloadable microcode for AdvanSys SCSI Adapters
  *
- *	$Id$
+ *	$FreeBSD$
  *
  * Obtained from:
  *
diff --git a/sys/dev/aic7xxx/aic7xxx.seq b/sys/dev/aic7xxx/aic7xxx.seq
index 1c2772e3f185..0193e3bbaff8 100644
--- a/sys/dev/aic7xxx/aic7xxx.seq
+++ b/sys/dev/aic7xxx/aic7xxx.seq
@@ -39,7 +39,7 @@
  *
  *-M************************************************************************/
 
-VERSION AIC7XXX_SEQ_VER "$Id: aic7xxx.seq,v 1.51 1996/11/22 08:25:20 gibbs Exp $"
+VERSION AIC7XXX_SEQ_VER "$FreeBSD$"
 
 #if defined(__NetBSD__)
 #include "../../../../dev/ic/aic7xxxreg.h"
diff --git a/sys/dev/aic7xxx/aic7xxx_asm.c b/sys/dev/aic7xxx/aic7xxx_asm.c
index cd1330e9d3be..cfaebb3bae97 100644
--- a/sys/dev/aic7xxx/aic7xxx_asm.c
+++ b/sys/dev/aic7xxx/aic7xxx_asm.c
@@ -43,7 +43,7 @@
  * are token separators.
  *
  *-M*************************************************************************/
-static char id[] = "$Id: aic7xxx_asm.c,v 1.11 1996/01/05 01:48:07 gibbs Exp $";
+static char id[] = "$FreeBSD$";
 #include <ctype.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/sys/dev/aic7xxx/aic7xxx_reg.h b/sys/dev/aic7xxx/aic7xxx_reg.h
index 0657b72d597f..c4afb3bbff9e 100644
--- a/sys/dev/aic7xxx/aic7xxx_reg.h
+++ b/sys/dev/aic7xxx/aic7xxx_reg.h
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: aic7xxx_reg.h,v 1.17 1996/11/16 01:07:35 gibbs Exp $
+ *	$FreeBSD$
  */
 
 /*
diff --git a/sys/dev/aic7xxx/aicasm.c b/sys/dev/aic7xxx/aicasm.c
index cd1330e9d3be..cfaebb3bae97 100644
--- a/sys/dev/aic7xxx/aicasm.c
+++ b/sys/dev/aic7xxx/aicasm.c
@@ -43,7 +43,7 @@
  * are token separators.
  *
  *-M*************************************************************************/
-static char id[] = "$Id: aic7xxx_asm.c,v 1.11 1996/01/05 01:48:07 gibbs Exp $";
+static char id[] = "$FreeBSD$";
 #include <ctype.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/sys/dev/aic7xxx/aicasm/aicasm.c b/sys/dev/aic7xxx/aicasm/aicasm.c
index cd1330e9d3be..cfaebb3bae97 100644
--- a/sys/dev/aic7xxx/aicasm/aicasm.c
+++ b/sys/dev/aic7xxx/aicasm/aicasm.c
@@ -43,7 +43,7 @@
  * are token separators.
  *
  *-M*************************************************************************/
-static char id[] = "$Id: aic7xxx_asm.c,v 1.11 1996/01/05 01:48:07 gibbs Exp $";
+static char id[] = "$FreeBSD$";
 #include <ctype.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/sys/dev/ar/if_ar.c b/sys/dev/ar/if_ar.c
index b5c87ad478d7..d95303588dd3 100644
--- a/sys/dev/ar/if_ar.c
+++ b/sys/dev/ar/if_ar.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: if_ar.c,v 1.11 1996/10/28 19:40:01 jhay Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/dev/ar/if_ar_isa.c b/sys/dev/ar/if_ar_isa.c
index b5c87ad478d7..d95303588dd3 100644
--- a/sys/dev/ar/if_ar_isa.c
+++ b/sys/dev/ar/if_ar_isa.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: if_ar.c,v 1.11 1996/10/28 19:40:01 jhay Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/dev/ar/if_arregs.h b/sys/dev/ar/if_arregs.h
index d64c11ec0276..6c5b020908e2 100644
--- a/sys/dev/ar/if_arregs.h
+++ b/sys/dev/ar/if_arregs.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: if_arregs.h,v 1.1.1.1 1995/11/21 02:32:04 peter Exp $
+ * $FreeBSD$
  */
 #ifndef _IF_ARREGS_H_
 #define _IF_ARREGS_H_
diff --git a/sys/dev/ccd/ccd.c b/sys/dev/ccd/ccd.c
index c0464539799d..1a831942a625 100644
--- a/sys/dev/ccd/ccd.c
+++ b/sys/dev/ccd/ccd.c
@@ -1,4 +1,4 @@
-/* $Id: ccd.c,v 1.17 1996/09/06 23:06:40 phk Exp $ */
+/* $FreeBSD$ */
 
 /*	$NetBSD: ccd.c,v 1.22 1995/12/08 19:13:26 thorpej Exp $	*/
 
diff --git a/sys/dev/cy/cy.c b/sys/dev/cy/cy.c
index dd9ec36755f0..928b9a686fc5 100644
--- a/sys/dev/cy/cy.c
+++ b/sys/dev/cy/cy.c
@@ -27,7 +27,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: cy.c,v 1.42 1996/11/13 18:31:57 bde Exp $
+ *	$FreeBSD$
  */
 
 #include "cy.h"
diff --git a/sys/dev/cy/cy_isa.c b/sys/dev/cy/cy_isa.c
index dd9ec36755f0..928b9a686fc5 100644
--- a/sys/dev/cy/cy_isa.c
+++ b/sys/dev/cy/cy_isa.c
@@ -27,7 +27,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: cy.c,v 1.42 1996/11/13 18:31:57 bde Exp $
+ *	$FreeBSD$
  */
 
 #include "cy.h"
diff --git a/sys/dev/cy/cy_pci.c b/sys/dev/cy/cy_pci.c
index dec0ddd14699..67aafcdbb83c 100644
--- a/sys/dev/cy/cy_pci.c
+++ b/sys/dev/cy/cy_pci.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: cy_pci.c,v 1.1 1996/10/13 01:09:23 davidg Exp $
+ *	$FreeBSD$
  */
 
 /*
diff --git a/sys/dev/cy/cyreg.h b/sys/dev/cy/cyreg.h
index 7f3c0150d722..545de360bda3 100644
--- a/sys/dev/cy/cyreg.h
+++ b/sys/dev/cy/cyreg.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: cyreg.h,v 1.2 1996/10/04 10:33:13 davidg Exp $
+ *	$FreeBSD$
  */
 
 /*
diff --git a/sys/dev/de/if_de.c b/sys/dev/de/if_de.c
index 95bc09599c25..878d09b6af36 100644
--- a/sys/dev/de/if_de.c
+++ b/sys/dev/de/if_de.c
@@ -21,7 +21,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: if_de.c,v 1.56 1996/12/01 06:01:00 rgrimes Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/dev/dgb/dgb.c b/sys/dev/dgb/dgb.c
index 2b54b17b1c39..af5e6e797eb2 100644
--- a/sys/dev/dgb/dgb.c
+++ b/sys/dev/dgb/dgb.c
@@ -1,5 +1,5 @@
 /*-
- *  dgb.c $Id: dgb.c,v 1.20 1996/09/06 23:06:47 phk Exp $
+ *  dgb.c $FreeBSD$
  *
  *  Digiboard driver.
  *
diff --git a/sys/dev/dgb/dgreg.h b/sys/dev/dgb/dgreg.h
index 4e5d27c4eb77..7c76b4177292 100644
--- a/sys/dev/dgb/dgreg.h
+++ b/sys/dev/dgb/dgreg.h
@@ -1,5 +1,5 @@
 /*-
- *  dgreg.h $Id: dgreg.h,v 1.4 1996/06/12 04:59:15 gpalmer Exp $
+ *  dgreg.h $FreeBSD$
  *
  *  Digiboard driver.
  *
diff --git a/sys/dev/ed/if_ed.c b/sys/dev/ed/if_ed.c
index e0b59b4838f0..86277fe22564 100644
--- a/sys/dev/ed/if_ed.c
+++ b/sys/dev/ed/if_ed.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_ed.c,v 1.111 1996/12/13 21:28:19 wollman Exp $
+ *	$FreeBSD$
  */
 
 /*
diff --git a/sys/dev/ed/if_ed_pci.c b/sys/dev/ed/if_ed_pci.c
index 76d3fe97f1d9..b4728bdd1cc8 100644
--- a/sys/dev/ed/if_ed_pci.c
+++ b/sys/dev/ed/if_ed_pci.c
@@ -17,7 +17,7 @@
  * 4. Modifications may be freely made to this file if the above conditions
  *    are met.
  *
- *	$Id: if_ed_p.c,v 1.5 1996/10/15 19:22:40 bde Exp $
+ *	$FreeBSD$
  */
 
 #include "pci.h"
diff --git a/sys/dev/ed/if_edreg.h b/sys/dev/ed/if_edreg.h
index db7db18376c3..db1a89d9f7ec 100644
--- a/sys/dev/ed/if_edreg.h
+++ b/sys/dev/ed/if_edreg.h
@@ -6,7 +6,7 @@
  *   of this software, nor does the author assume any responsibility
  *   for damages incurred with its use.
  *
- * $Id: if_edreg.h,v 1.20 1996/01/30 22:55:38 mpp Exp $
+ * $FreeBSD$
  */
 /*
  * National Semiconductor DS8390 NIC register definitions
diff --git a/sys/dev/eisa/eisaconf.c b/sys/dev/eisa/eisaconf.c
index eeef75831bd5..d9a915f524e8 100644
--- a/sys/dev/eisa/eisaconf.c
+++ b/sys/dev/eisa/eisaconf.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: eisaconf.c,v 1.23 1996/09/08 10:43:42 phk Exp $
+ *	$FreeBSD$
  */
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/eisa/eisaconf.h b/sys/dev/eisa/eisaconf.h
index 0634a4fbb812..6d211827872f 100644
--- a/sys/dev/eisa/eisaconf.h
+++ b/sys/dev/eisa/eisaconf.h
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: eisaconf.h,v 1.11 1996/09/08 10:43:42 phk Exp $
+ *	$FreeBSD$
  */
 
 #ifndef _I386_EISA_EISACONF_H_
diff --git a/sys/dev/ep/if_ep.c b/sys/dev/ep/if_ep.c
index 01fca4f5c5c6..25da73185daf 100644
--- a/sys/dev/ep/if_ep.c
+++ b/sys/dev/ep/if_ep.c
@@ -38,7 +38,7 @@
  */
 
 /*
- *  $Id: if_ep.c,v 1.54 1996/12/13 21:28:21 wollman Exp $
+ *  $FreeBSD$
  *
  *  Promiscuous mode added and interrupt logic slightly changed
  *  to reduce the number of adapter failures. Transceiver select
diff --git a/sys/dev/ep/if_ep_eisa.c b/sys/dev/ep/if_ep_eisa.c
index 3b0530245f62..87192e769402 100644
--- a/sys/dev/ep/if_ep_eisa.c
+++ b/sys/dev/ep/if_ep_eisa.c
@@ -19,7 +19,7 @@
  * 4. Modifications may be freely made to this file if the above conditions
  *    are met.
  *
- *	$Id: 3c5x9.c,v 1.6 1996/10/12 17:34:25 bde Exp $
+ *	$FreeBSD$
  */
 
 #include "eisa.h"
diff --git a/sys/dev/ep/if_epreg.h b/sys/dev/ep/if_epreg.h
index 1bef6154eac7..0f440632f066 100644
--- a/sys/dev/ep/if_epreg.h
+++ b/sys/dev/ep/if_epreg.h
@@ -31,7 +31,7 @@
 
  */
 /*
- *  $Id: if_epreg.h,v 1.17 1996/09/08 10:44:10 phk Exp $
+ *  $FreeBSD$
  *
  *  Promiscuous mode added and interrupt logic slightly changed
  *  to reduce the number of adapter failures. Transceiver select
diff --git a/sys/dev/fdc/fdc.c b/sys/dev/fdc/fdc.c
index 19959a142377..9c095c9e7533 100644
--- a/sys/dev/fdc/fdc.c
+++ b/sys/dev/fdc/fdc.c
@@ -43,7 +43,7 @@
  * SUCH DAMAGE.
  *
  *	from:	@(#)fd.c	7.4 (Berkeley) 5/25/91
- *	$Id: fd.c,v 1.93 1996/11/02 23:31:11 joerg Exp $
+ *	$FreeBSD$
  *
  */
 
diff --git a/sys/dev/fdc/fdcreg.h b/sys/dev/fdc/fdcreg.h
index aef83574199a..a98bda7902fd 100644
--- a/sys/dev/fdc/fdcreg.h
+++ b/sys/dev/fdc/fdcreg.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)fdreg.h	7.1 (Berkeley) 5/9/91
- *	$Id: fdreg.h,v 1.7 1994/09/25 18:42:23 joerg Exp $
+ *	$FreeBSD$
  */
 
 /*
diff --git a/sys/dev/fe/if_fe.c b/sys/dev/fe/if_fe.c
index c71473421e5a..07fe89143d64 100644
--- a/sys/dev/fe/if_fe.c
+++ b/sys/dev/fe/if_fe.c
@@ -21,7 +21,7 @@
  */
 
 /*
- * $Id: if_fe.c,v 1.22 1996/12/13 21:28:22 wollman Exp $
+ * $FreeBSD$
  *
  * Device driver for Fujitsu MB86960A/MB86965A based Ethernet cards.
  * To be used with FreeBSD 2.x
diff --git a/sys/dev/fe/if_fereg.h b/sys/dev/fe/if_fereg.h
index f652611f4ff1..da5da5b4bce3 100644
--- a/sys/dev/fe/if_fereg.h
+++ b/sys/dev/fe/if_fereg.h
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  */
 
-/* $Id:$ */
+/* $FreeBSD$ */
 
 /*
  * Registers on FMV-180 series' ISA bus interface ASIC.
diff --git a/sys/dev/fxp/if_fxp.c b/sys/dev/fxp/if_fxp.c
index eed462393492..a85fe96a8db0 100644
--- a/sys/dev/fxp/if_fxp.c
+++ b/sys/dev/fxp/if_fxp.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_fxp.c,v 1.23 1996/12/10 07:29:50 davidg Exp $
+ *	$FreeBSD$
  */
 
 /*
diff --git a/sys/dev/fxp/if_fxpreg.h b/sys/dev/fxp/if_fxpreg.h
index c84ade9a1aff..5a3e81240837 100644
--- a/sys/dev/fxp/if_fxpreg.h
+++ b/sys/dev/fxp/if_fxpreg.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_fxpreg.h,v 1.2 1995/12/05 11:49:55 davidg Exp $
+ *	$FreeBSD$
  */
 
 #define FXP_VENDORID_INTEL	0x8086
diff --git a/sys/dev/ic/cd1400.h b/sys/dev/ic/cd1400.h
index ffebd9ab5a8d..4e95518c6b53 100644
--- a/sys/dev/ic/cd1400.h
+++ b/sys/dev/ic/cd1400.h
@@ -27,7 +27,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: $
+ *	$FreeBSD$
  */
 
 /*
diff --git a/sys/dev/ic/esp.h b/sys/dev/ic/esp.h
index 6621e6503917..72367141b0b2 100644
--- a/sys/dev/ic/esp.h
+++ b/sys/dev/ic/esp.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$FreeBSD$
  */
 
 #ifndef _IC_ESP_H_
diff --git a/sys/dev/ic/hd64570.h b/sys/dev/ic/hd64570.h
index 583a8c923998..b676e25a9cd5 100644
--- a/sys/dev/ic/hd64570.h
+++ b/sys/dev/ic/hd64570.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: hd64570.h,v 1.2 1996/03/17 00:29:35 peter Exp $
+ * $FreeBSD$
  */
 #ifndef _HD64570_H_
 #define _HD64570_H_
diff --git a/sys/dev/ic/i8237.h b/sys/dev/ic/i8237.h
index 5493ca8eb44e..a7c45c5f3456 100644
--- a/sys/dev/ic/i8237.h
+++ b/sys/dev/ic/i8237.h
@@ -1,7 +1,7 @@
 /*
  * Intel 8237 DMA Controller
  *
- *	$Id: i8237.h,v 1.3 1994/11/01 17:26:47 ache Exp $
+ *	$FreeBSD$
  */
 
 #define	DMA37MD_SINGLE	0x40	/* single pass mode */
diff --git a/sys/dev/ic/i82586.h b/sys/dev/ic/i82586.h
index 612a669befa2..980c13a0627d 100644
--- a/sys/dev/ic/i82586.h
+++ b/sys/dev/ic/i82586.h
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: i82586.h,v 1.2 1995/10/31 18:41:47 phk Exp $
+ *	$FreeBSD$
  */
 
 /*
diff --git a/sys/dev/ic/nec765.h b/sys/dev/ic/nec765.h
index 810e825bd66e..3d2cdac6e6bc 100644
--- a/sys/dev/ic/nec765.h
+++ b/sys/dev/ic/nec765.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)nec765.h	7.1 (Berkeley) 5/9/91
- *	$Id: nec765.h,v 1.3 1994/09/17 16:56:10 davidg Exp $
+ *	$FreeBSD$
  */
 
 /*
diff --git a/sys/dev/ic/ns16550.h b/sys/dev/ic/ns16550.h
index dae85bcaf583..1733d18962ea 100644
--- a/sys/dev/ic/ns16550.h
+++ b/sys/dev/ic/ns16550.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)ns16550.h	7.1 (Berkeley) 5/9/91
- *	$Id: ns16550.h,v 1.2 1993/10/16 13:48:52 rgrimes Exp $
+ *	$FreeBSD$
  */
 
 /*
diff --git a/sys/dev/ie/if_ie.c b/sys/dev/ie/if_ie.c
index 6795bf1fb8b6..beb9184e183e 100644
--- a/sys/dev/ie/if_ie.c
+++ b/sys/dev/ie/if_ie.c
@@ -43,7 +43,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_ie.c,v 1.36 1996/09/06 23:07:36 phk Exp $
+ *	$FreeBSD$
  */
 
 /*
diff --git a/sys/dev/ie/if_ie507.h b/sys/dev/ie/if_ie507.h
index 4bf87fcbb597..9be1396cf49e 100644
--- a/sys/dev/ie/if_ie507.h
+++ b/sys/dev/ie/if_ie507.h
@@ -1,5 +1,5 @@
 /*
- * $Id: if_ie507.h,v 1.1 1994/05/25 20:06:49 ats Exp $
+ * $FreeBSD$
  * Definitions for 3C507
  */
 
diff --git a/sys/dev/ie/if_iereg.h b/sys/dev/ie/if_iereg.h
index 3588b8414058..875f63ca9dbb 100644
--- a/sys/dev/ie/if_iereg.h
+++ b/sys/dev/ie/if_iereg.h
@@ -1,5 +1,5 @@
 /*
- * $Id$
+ * $FreeBSD$
  * definitions for AT&T StarLAN 10 etc...
  */
 
diff --git a/sys/dev/kbd/kbdtables.h b/sys/dev/kbd/kbdtables.h
index 9f69ee4328ac..9c66fa521225 100644
--- a/sys/dev/kbd/kbdtables.h
+++ b/sys/dev/kbd/kbdtables.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: kbdtables.h,v 1.31 1996/01/25 16:37:20 ache Exp $
+ *	$FreeBSD$
  */
 
 #define SET8 0x80       	/* set eight bit on */
diff --git a/sys/dev/lnc/if_lnc_pci.c b/sys/dev/lnc/if_lnc_pci.c
index ba97985403d0..ccee850fb92f 100644
--- a/sys/dev/lnc/if_lnc_pci.c
+++ b/sys/dev/lnc/if_lnc_pci.c
@@ -17,7 +17,7 @@
  * 4. Modifications may be freely made to this file if the above conditions
  *    are met.
  *
- *	$Id:$
+ *	$FreeBSD$
  */
 
 #include "pci.h"
diff --git a/sys/dev/mcd/mcd.c b/sys/dev/mcd/mcd.c
index dcb1abc2e069..4049bd905c63 100644
--- a/sys/dev/mcd/mcd.c
+++ b/sys/dev/mcd/mcd.c
@@ -40,7 +40,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: mcd.c,v 1.82 1996/07/23 21:51:36 phk Exp $
+ *	$FreeBSD$
  */
 static const char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore";
 
diff --git a/sys/dev/mcd/mcdreg.h b/sys/dev/mcd/mcdreg.h
index 146159a7cc24..2004a9d890dc 100644
--- a/sys/dev/mcd/mcdreg.h
+++ b/sys/dev/mcd/mcdreg.h
@@ -41,7 +41,7 @@
  * the manufacturer or anyone else might provide better documentation,
  * so this file (and the driver) will then have a better quality.
  *
- *	$Id: mcdreg.h,v 1.10 1996/02/01 17:19:46 ache Exp $
+ *	$FreeBSD$
  */
 
 #ifndef MCD_H
diff --git a/sys/dev/mse/mse.c b/sys/dev/mse/mse.c
index 50f04be3041b..e9f34ad520a9 100644
--- a/sys/dev/mse/mse.c
+++ b/sys/dev/mse/mse.c
@@ -11,7 +11,7 @@
  * this software for any purpose.  It is provided "as is"
  * without express or implied warranty.
  *
- * $Id: mse.c,v 1.28 1996/09/06 23:07:51 phk Exp $
+ * $FreeBSD$
  */
 /*
  * Driver for the Logitech and ATI Inport Bus mice for use with 386bsd and
diff --git a/sys/dev/pci/pci.c b/sys/dev/pci/pci.c
index 054bdaaada0f..c332094788ed 100644
--- a/sys/dev/pci/pci.c
+++ b/sys/dev/pci/pci.c
@@ -1,6 +1,6 @@
 /**************************************************************************
 **
-**  $Id: pci.c,v 1.58 1996/11/12 23:10:17 se Exp $
+**  $FreeBSD$
 **
 **  General subroutines for the PCI bus.
 **  pci_configure ()
diff --git a/sys/dev/pci/pcireg.h b/sys/dev/pci/pcireg.h
index d8b4b5bf395f..049fca77077d 100644
--- a/sys/dev/pci/pcireg.h
+++ b/sys/dev/pci/pcireg.h
@@ -1,6 +1,6 @@
 /**************************************************************************
 **
-**  $Id: pcireg.h,v 1.9 1996/11/12 23:10:24 se Exp $
+**  $FreeBSD$
 **
 **  Names for PCI configuration space registers.
 **
diff --git a/sys/dev/pci/pcivar.h b/sys/dev/pci/pcivar.h
index 61127e16ecc3..af389ff91f9c 100644
--- a/sys/dev/pci/pcivar.h
+++ b/sys/dev/pci/pcivar.h
@@ -1,6 +1,6 @@
 /**************************************************************************
 **
-**  $Id: pcivar.h,v 1.12 1996/09/08 10:44:14 phk Exp $
+**  $FreeBSD$
 **
 **  Declarations for pci device drivers.
 **
diff --git a/sys/dev/ppbus/lptio.h b/sys/dev/ppbus/lptio.h
index 14ea3d325534..56d196a62fef 100644
--- a/sys/dev/ppbus/lptio.h
+++ b/sys/dev/ppbus/lptio.h
@@ -11,7 +11,7 @@
  *
  *	Geoff Rehmet, Rhodes University, South Africa <csgr@cs.ru.ac.za>
  *
- * $Id: lpt.h,v 1.3 1995/05/30 08:00:41 rgrimes Exp $
+ * $FreeBSD$
  */
 
 #ifndef	_MACHINE_LPT_H_
diff --git a/sys/dev/scd/scd.c b/sys/dev/scd/scd.c
index f08439d03de5..54a050e2ba7e 100644
--- a/sys/dev/scd/scd.c
+++ b/sys/dev/scd/scd.c
@@ -41,7 +41,7 @@
  */
 
 
-/* $Id: scd.c,v 1.24 1996/07/23 21:51:39 phk Exp $ */
+/* $FreeBSD$ */
 
 /* Please send any comments to micke@dynas.se */
 
diff --git a/sys/dev/scd/scdreg.h b/sys/dev/scd/scdreg.h
index 176f002cf547..e9ce3b15a23f 100644
--- a/sys/dev/scd/scdreg.h
+++ b/sys/dev/scd/scdreg.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: scdreg.h,v 1.1 1995/03/24 18:33:02 jkh Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/dev/si/si.c b/sys/dev/si/si.c
index 81d8026130e1..68662435146f 100644
--- a/sys/dev/si/si.c
+++ b/sys/dev/si/si.c
@@ -30,7 +30,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
  * NO EVENT SHALL THE AUTHORS BE LIABLE.
  *
- *	$Id: si.c,v 1.52 1996/09/06 23:08:03 phk Exp $
+ *	$FreeBSD$
  */
 
 #ifndef lint
diff --git a/sys/dev/si/si.h b/sys/dev/si/si.h
index 31530bf057d6..336eda4427a7 100644
--- a/sys/dev/si/si.h
+++ b/sys/dev/si/si.h
@@ -30,7 +30,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
  * NO EVENT SHALL THE AUTHORS BE LIABLE.
  *
- *	$Id: si.h,v 1.5 1995/11/09 21:53:48 peter Exp $
+ *	$FreeBSD$
  */
 
 /*
diff --git a/sys/dev/si/sireg.h b/sys/dev/si/sireg.h
index e2c990657d75..1a7cdfe30944 100644
--- a/sys/dev/si/sireg.h
+++ b/sys/dev/si/sireg.h
@@ -30,7 +30,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
  * NO EVENT SHALL THE AUTHORS BE LIABLE.
  *
- *	$Id: sireg.h,v 1.1 1995/08/09 13:13:47 peter Exp $
+ *	$FreeBSD$
  */
 
 /*
diff --git a/sys/dev/sio/sio.c b/sys/dev/sio/sio.c
index c34091e0b41c..fe3c204f992d 100644
--- a/sys/dev/sio/sio.c
+++ b/sys/dev/sio/sio.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)com.c	7.5 (Berkeley) 5/16/91
- *	$Id: sio.c,v 1.154 1996/11/30 15:52:56 bde Exp $
+ *	$FreeBSD$
  */
 
 #include "opt_comconsole.h"
diff --git a/sys/dev/sio/sioreg.h b/sys/dev/sio/sioreg.h
index 486ac54c51e0..b447b61bb5df 100644
--- a/sys/dev/sio/sioreg.h
+++ b/sys/dev/sio/sioreg.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)comreg.h	7.2 (Berkeley) 5/9/91
- *	$Id: sioreg.h,v 1.4 1995/12/10 13:39:15 phk Exp $
+ *	$FreeBSD$
  */
 
 
diff --git a/sys/dev/speaker/speaker.h b/sys/dev/speaker/speaker.h
index 7a233c712a0c..78b55b6135e3 100644
--- a/sys/dev/speaker/speaker.h
+++ b/sys/dev/speaker/speaker.h
@@ -4,7 +4,7 @@
  * v1.4 by Eric S. Raymond (esr@snark.thyrsus.com) Aug 1993
  *      modified for FreeBSD by Andrew A. Chernov <ache@astral.msk.su>
  *
- * $Id: speaker.h,v 1.2 1994/08/02 07:39:05 davidg Exp $
+ * $FreeBSD$
  */
 
 #ifndef	_MACHINE_SPEAKER_H_
diff --git a/sys/dev/speaker/spkr.c b/sys/dev/speaker/spkr.c
index 232daf22248f..e11b9e29e667 100644
--- a/sys/dev/speaker/spkr.c
+++ b/sys/dev/speaker/spkr.c
@@ -4,7 +4,7 @@
  * v1.4 by Eric S. Raymond (esr@snark.thyrsus.com) Aug 1993
  * modified for FreeBSD by Andrew A. Chernov <ache@astral.msk.su>
  *
- *    $Id: spkr.c,v 1.26 1996/08/24 03:24:39 peter Exp $
+ *    $FreeBSD$
  */
 
 #include "speaker.h"
diff --git a/sys/dev/sr/if_sr.c b/sys/dev/sr/if_sr.c
index f41d76079e5f..323085a5da3b 100644
--- a/sys/dev/sr/if_sr.c
+++ b/sys/dev/sr/if_sr.c
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: if_sr.c,v 1.3 1996/10/29 03:52:51 jhay Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/dev/sr/if_sr_isa.c b/sys/dev/sr/if_sr_isa.c
index f41d76079e5f..323085a5da3b 100644
--- a/sys/dev/sr/if_sr_isa.c
+++ b/sys/dev/sr/if_sr_isa.c
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: if_sr.c,v 1.3 1996/10/29 03:52:51 jhay Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/dev/sr/if_sr_pci.c b/sys/dev/sr/if_sr_pci.c
index eed3f34e02d2..ffe4e5314daf 100644
--- a/sys/dev/sr/if_sr_pci.c
+++ b/sys/dev/sr/if_sr_pci.c
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: if_sr_p.c,v 1.1 1996/10/29 03:53:21 jhay Exp $
+ * $FreeBSD$
  */
 
 #include "pci.h"
diff --git a/sys/dev/sr/if_srregs.h b/sys/dev/sr/if_srregs.h
index 4278899b4c4e..64d9ba11c50e 100644
--- a/sys/dev/sr/if_srregs.h
+++ b/sys/dev/sr/if_srregs.h
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: if_srregs.h,v 1.1 1996/07/05 18:49:22 jhay Exp $
+ * $FreeBSD$
  */
 #ifndef _IF_SRREGS_H_
 #define _IF_SRREGS_H_
diff --git a/sys/dev/syscons/blank/blank_saver.c b/sys/dev/syscons/blank/blank_saver.c
index 6b68c1a5c1cb..6af28601a15c 100644
--- a/sys/dev/syscons/blank/blank_saver.c
+++ b/sys/dev/syscons/blank/blank_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: blank_saver.c,v 1.5 1995/11/14 07:34:34 bde Exp $
+ *	$FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/syscons/fade/fade_saver.c b/sys/dev/syscons/fade/fade_saver.c
index 21dfa82b2d4c..524022d8d136 100644
--- a/sys/dev/syscons/fade/fade_saver.c
+++ b/sys/dev/syscons/fade/fade_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: fade_saver.c,v 1.5 1995/11/14 07:34:42 bde Exp $
+ *	$FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/syscons/green/green_saver.c b/sys/dev/syscons/green/green_saver.c
index e431dd744afa..6bb5fcb03c4e 100644
--- a/sys/dev/syscons/green/green_saver.c
+++ b/sys/dev/syscons/green/green_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: green_saver.c,v 1.5 1995/11/14 07:34:50 bde Exp $
+ *	$FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/syscons/snake/snake_saver.c b/sys/dev/syscons/snake/snake_saver.c
index dc00faac8416..80ecdc6b94c4 100644
--- a/sys/dev/syscons/snake/snake_saver.c
+++ b/sys/dev/syscons/snake/snake_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: snake_saver.c,v 1.10 1996/07/01 20:28:54 bde Exp $
+ *	$FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/syscons/star/star_saver.c b/sys/dev/syscons/star/star_saver.c
index a31de13a54f5..5ee93e1b24d6 100644
--- a/sys/dev/syscons/star/star_saver.c
+++ b/sys/dev/syscons/star/star_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: star_saver.c,v 1.7 1995/11/29 20:10:33 wollman Exp $
+ *	$FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c
index af604d0de16c..853efd6f16e2 100644
--- a/sys/dev/syscons/syscons.c
+++ b/sys/dev/syscons/syscons.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: syscons.c,v 1.191 1996/12/07 22:32:12 sos Exp $
+ *  $FreeBSD$
  */
 
 #include "sc.h"
diff --git a/sys/dev/syscons/syscons.h b/sys/dev/syscons/syscons.h
index 19a3d67eb1cc..a9d5a04e6f01 100644
--- a/sys/dev/syscons/syscons.h
+++ b/sys/dev/syscons/syscons.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: syscons.h,v 1.23 1996/10/23 07:29:44 pst Exp $
+ *	$FreeBSD$
  */
 
 #ifndef _I386_ISA_SYSCONS_H_
diff --git a/sys/dev/vn/vn.c b/sys/dev/vn/vn.c
index fc6322b2d4be..cbff83c47a26 100644
--- a/sys/dev/vn/vn.c
+++ b/sys/dev/vn/vn.c
@@ -38,7 +38,7 @@
  * from: Utah Hdr: vn.c 1.13 94/04/02
  *
  *	from: @(#)vn.c	8.6 (Berkeley) 4/1/94
- *	$Id: vn.c,v 1.40 1996/08/22 03:50:00 julian Exp $
+ *	$FreeBSD$
  */
 
 /*