summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/dev/eisa/if_fea.c1
-rw-r--r--sys/dev/ic/lptreg.h1
-rw-r--r--sys/dev/isa/ad1848var.h1
-rw-r--r--sys/dev/isa/btreg.h2
-rw-r--r--sys/dev/isa/devlist2h.awk1
-rw-r--r--sys/dev/isa/elink.c1
-rw-r--r--sys/dev/isa/elink.h1
-rw-r--r--sys/dev/isa/if_eg.c1
-rw-r--r--sys/dev/isa/if_egreg.h1
-rw-r--r--sys/dev/isa/if_elreg.h1
-rw-r--r--sys/dev/isa/if_ep_isa.c1
-rw-r--r--sys/dev/isa/if_fe.c2
-rw-r--r--sys/dev/isa/if_fereg.h2
-rw-r--r--sys/dev/isa/if_ie507.h1
-rw-r--r--sys/dev/isa/if_ieatt.h1
-rw-r--r--sys/dev/isa/if_iee16.h2
-rw-r--r--sys/dev/isa/if_iy.c1
-rw-r--r--sys/dev/isa/if_levar.h1
-rw-r--r--sys/dev/isa/isadmareg.h1
-rw-r--r--sys/dev/isa/isareg.h1
-rw-r--r--sys/dev/isa/mcdreg.h1
-rw-r--r--sys/dev/isa/pasreg.h1
-rw-r--r--sys/dev/isa/pnpdevs2
-rw-r--r--sys/dev/isa/pssreg.h1
-rw-r--r--sys/dev/isa/seagate.c2
-rw-r--r--sys/dev/isa/wdsreg.h2
-rw-r--r--sys/dev/isa/wssreg.h1
-rw-r--r--sys/dev/isa/wtreg.h1
-rw-r--r--sys/dev/microcode/Makefile.inc2
-rw-r--r--sys/dev/microcode/aic7xxx/aic7xxx_reg.h3
-rw-r--r--sys/dev/microcode/ncr53cxxx/Makefile.inc1
-rw-r--r--sys/dev/mulaw.c2
-rw-r--r--sys/dev/ofw/files.ofw2
-rw-r--r--sys/dev/ofw/ofbus.c1
-rw-r--r--sys/dev/ofw/ofcons.c1
-rw-r--r--sys/dev/ofw/ofdisk.c1
-rw-r--r--sys/dev/ofw/ofnet.c1
-rw-r--r--sys/dev/ofw/ofrtc.c1
-rw-r--r--sys/dev/ofw/openfirm.h1
-rw-r--r--sys/dev/pci/README1
-rw-r--r--sys/dev/pci/devlist2h.awk1
-rw-r--r--sys/dev/pci/if_ep_pci.c1
-rw-r--r--sys/dev/pci/if_le_pci.c1
-rw-r--r--sys/dev/pci/if_levar.h1
-rw-r--r--sys/dev/pci/pcidevs4
-rw-r--r--sys/dev/pcmcia/pcmcia.h2
-rw-r--r--sys/dev/pcmcia/pcmcia_conf.c2
-rw-r--r--sys/dev/pcmcia/pcmcia_ioctl.h2
-rw-r--r--sys/dev/pcmcia/pcmciareg.h2
-rw-r--r--sys/dev/pcmcia/pcmciavar.h2
-rw-r--r--sys/dev/rcons/files.rcons1
-rw-r--r--sys/dev/rcons/raster.h1
-rw-r--r--sys/dev/rcons/raster_text.c1
-rw-r--r--sys/dev/rcons/rcons_subr.c1
-rw-r--r--sys/dev/rcons/rcons_subr.h1
-rw-r--r--sys/dev/tc/asc_ioasic.c1
-rw-r--r--sys/dev/tc/asc_tc.c1
-rw-r--r--sys/dev/tc/ascvar.h1
-rw-r--r--sys/dev/tc/if_fta.c1
-rw-r--r--sys/dev/tc/if_le_dec.c1
-rw-r--r--sys/dev/tc/if_le_ibus.c1
-rw-r--r--sys/dev/tc/if_le_ioasic.c1
-rw-r--r--sys/dev/tc/if_le_tc.c1
-rw-r--r--sys/dev/tc/if_levar.h1
-rw-r--r--sys/dev/tc/ioasicvar.h1
-rw-r--r--sys/dev/tc/tcreg.h1
-rw-r--r--sys/dev/vndioctl.h1
67 files changed, 81 insertions, 6 deletions
diff --git a/sys/dev/eisa/if_fea.c b/sys/dev/eisa/if_fea.c
index 03ba41178ff..453e293879a 100644
--- a/sys/dev/eisa/if_fea.c
+++ b/sys/dev/eisa/if_fea.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: if_fea.c,v 1.6 1997/11/07 08:06:39 niklas Exp $ */
/* $NetBSD: if_fea.c,v 1.9 1996/10/21 22:31:05 thorpej Exp $ */
/*-
diff --git a/sys/dev/ic/lptreg.h b/sys/dev/ic/lptreg.h
index 3d274a0f3f6..bcc2eb9f6e6 100644
--- a/sys/dev/ic/lptreg.h
+++ b/sys/dev/ic/lptreg.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: lptreg.h,v 1.3 1997/11/07 08:06:40 niklas Exp $ */
/* $NetBSD: lptreg.h,v 1.4 1994/10/27 04:17:56 cgd Exp $ */
/*-
diff --git a/sys/dev/isa/ad1848var.h b/sys/dev/isa/ad1848var.h
index a9e9d29dfc5..8d6e3729cbe 100644
--- a/sys/dev/isa/ad1848var.h
+++ b/sys/dev/isa/ad1848var.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: ad1848var.h,v 1.5 1997/11/07 08:06:42 niklas Exp $ */
/* $NetBSD: ad1848var.h,v 1.8 1996/04/29 20:02:37 christos Exp $ */
/*
diff --git a/sys/dev/isa/btreg.h b/sys/dev/isa/btreg.h
index 5bb6c9b9d30..720a971d499 100644
--- a/sys/dev/isa/btreg.h
+++ b/sys/dev/isa/btreg.h
@@ -1,3 +1,5 @@
+/* $OpenBSD: btreg.h,v 1.5 1997/11/07 08:06:43 niklas Exp $ */
+
typedef u_int8_t physaddr[4];
typedef u_int8_t physlen[4];
#define ltophys _lto4l
diff --git a/sys/dev/isa/devlist2h.awk b/sys/dev/isa/devlist2h.awk
index d21fa27c21b..2d21fdeeaab 100644
--- a/sys/dev/isa/devlist2h.awk
+++ b/sys/dev/isa/devlist2h.awk
@@ -1,4 +1,5 @@
#! /usr/bin/awk -f
+# $OpenBSD: devlist2h.awk,v 1.2 1997/11/07 08:06:44 niklas Exp $
# $NetBSD: devlist2h.awk,v 1.2 1996/01/22 21:08:09 cgd Exp $
#
# Copyright (c) 1995, 1996 Christopher G. Demetriou
diff --git a/sys/dev/isa/elink.c b/sys/dev/isa/elink.c
index 2705ea7be4f..2ae326fba4a 100644
--- a/sys/dev/isa/elink.c
+++ b/sys/dev/isa/elink.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: elink.c,v 1.5 1997/11/07 08:06:45 niklas Exp $ */
/* $NetBSD: elink.c,v 1.9 1996/05/03 19:06:27 christos Exp $ */
/*
diff --git a/sys/dev/isa/elink.h b/sys/dev/isa/elink.h
index 8284f39c38b..b08beb2ef79 100644
--- a/sys/dev/isa/elink.h
+++ b/sys/dev/isa/elink.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: elink.h,v 1.4 1997/11/07 08:06:46 niklas Exp $ */
/* $NetBSD: elink.h,v 1.4 1996/04/30 22:16:31 thorpej Exp $ */
/*
diff --git a/sys/dev/isa/if_eg.c b/sys/dev/isa/if_eg.c
index ec89df2be3b..dd28594204d 100644
--- a/sys/dev/isa/if_eg.c
+++ b/sys/dev/isa/if_eg.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: if_eg.c,v 1.13 1997/11/07 08:06:47 niklas Exp $ */
/* $NetBSD: if_eg.c,v 1.26 1996/05/12 23:52:27 mycroft Exp $ */
/*
diff --git a/sys/dev/isa/if_egreg.h b/sys/dev/isa/if_egreg.h
index 09f56ddd89b..a15c870d0ec 100644
--- a/sys/dev/isa/if_egreg.h
+++ b/sys/dev/isa/if_egreg.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: if_egreg.h,v 1.2 1997/11/07 08:06:48 niklas Exp $ */
/* $NetBSD: if_egreg.h,v 1.3 1995/07/23 21:14:35 mycroft Exp $ */
/*
diff --git a/sys/dev/isa/if_elreg.h b/sys/dev/isa/if_elreg.h
index 51f85999ace..c15edc45abb 100644
--- a/sys/dev/isa/if_elreg.h
+++ b/sys/dev/isa/if_elreg.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: if_elreg.h,v 1.2 1997/11/07 08:06:50 niklas Exp $ */
/* $NetBSD: if_elreg.h,v 1.4 1994/10/27 04:17:29 cgd Exp $ */
/*
diff --git a/sys/dev/isa/if_ep_isa.c b/sys/dev/isa/if_ep_isa.c
index 6b85f8cd9ed..f98101a50d3 100644
--- a/sys/dev/isa/if_ep_isa.c
+++ b/sys/dev/isa/if_ep_isa.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: if_ep_isa.c,v 1.10 1997/11/07 08:06:51 niklas Exp $ */
/* $NetBSD: if_ep_isa.c,v 1.5 1996/05/12 23:52:36 mycroft Exp $ */
/*
diff --git a/sys/dev/isa/if_fe.c b/sys/dev/isa/if_fe.c
index a9379b4d9eb..7ed9f0194a5 100644
--- a/sys/dev/isa/if_fe.c
+++ b/sys/dev/isa/if_fe.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: if_fe.c,v 1.11 1997/11/07 08:06:53 niklas Exp $ */
+
/*
* All Rights Reserved, Copyright (C) Fujitsu Limited 1995
*
diff --git a/sys/dev/isa/if_fereg.h b/sys/dev/isa/if_fereg.h
index b2e842c95c9..b09f09497f1 100644
--- a/sys/dev/isa/if_fereg.h
+++ b/sys/dev/isa/if_fereg.h
@@ -1,3 +1,5 @@
+/* $OpenBSD: if_fereg.h,v 1.2 1997/11/07 08:06:55 niklas Exp $ */
+
/*
* All Rights Reserved, Copyright (C) Fujitsu Limited 1995
*
diff --git a/sys/dev/isa/if_ie507.h b/sys/dev/isa/if_ie507.h
index 769911fc2da..ec29dfa3470 100644
--- a/sys/dev/isa/if_ie507.h
+++ b/sys/dev/isa/if_ie507.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: if_ie507.h,v 1.2 1997/11/07 08:06:56 niklas Exp $ */
/* $NetBSD: if_ie507.h,v 1.5 1995/01/23 04:50:10 mycroft Exp $ */
/*
diff --git a/sys/dev/isa/if_ieatt.h b/sys/dev/isa/if_ieatt.h
index f39114b6daa..8500d8fe741 100644
--- a/sys/dev/isa/if_ieatt.h
+++ b/sys/dev/isa/if_ieatt.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: if_ieatt.h,v 1.2 1997/11/07 08:06:58 niklas Exp $ */
/* $NetBSD: if_ieatt.h,v 1.2 1994/10/27 04:17:40 cgd Exp $ */
/*
diff --git a/sys/dev/isa/if_iee16.h b/sys/dev/isa/if_iee16.h
index 14242ad6be5..1a9dd19186f 100644
--- a/sys/dev/isa/if_iee16.h
+++ b/sys/dev/isa/if_iee16.h
@@ -1,3 +1,5 @@
+/* $OpenBSD: if_iee16.h,v 1.2 1997/11/07 08:06:59 niklas Exp $ */
+
/*
* Copyright (c) 1993, 1994, 1995
diff --git a/sys/dev/isa/if_iy.c b/sys/dev/isa/if_iy.c
index 4dd2482a5f3..363ddbefbab 100644
--- a/sys/dev/isa/if_iy.c
+++ b/sys/dev/isa/if_iy.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: if_iy.c,v 1.3 1997/11/07 08:07:00 niklas Exp $ */
/* $NetBSD: if_iy.c,v 1.4 1996/05/12 23:52:53 mycroft Exp $ */
/* #define IYDEBUG */
/* #define IYMEMDEBUG */
diff --git a/sys/dev/isa/if_levar.h b/sys/dev/isa/if_levar.h
index 17bee1b131f..ac135898e89 100644
--- a/sys/dev/isa/if_levar.h
+++ b/sys/dev/isa/if_levar.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: if_levar.h,v 1.5 1997/11/07 08:07:01 niklas Exp $ */
/* $NetBSD: if_levar.h,v 1.5 1996/05/07 01:50:07 thorpej Exp $ */
/*
diff --git a/sys/dev/isa/isadmareg.h b/sys/dev/isa/isadmareg.h
index 47744042425..e26bf8f808d 100644
--- a/sys/dev/isa/isadmareg.h
+++ b/sys/dev/isa/isadmareg.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: isadmareg.h,v 1.4 1997/11/07 08:07:02 niklas Exp $ */
/* $NetBSD: isadmareg.h,v 1.4 1995/06/28 04:31:48 cgd Exp $ */
#include <dev/ic/i8237reg.h>
diff --git a/sys/dev/isa/isareg.h b/sys/dev/isa/isareg.h
index 311ed697c37..1bff1e05249 100644
--- a/sys/dev/isa/isareg.h
+++ b/sys/dev/isa/isareg.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: isareg.h,v 1.2 1997/11/07 08:07:03 niklas Exp $ */
/* $NetBSD: isareg.h,v 1.5 1995/04/17 12:09:13 cgd Exp $ */
/*-
diff --git a/sys/dev/isa/mcdreg.h b/sys/dev/isa/mcdreg.h
index 11bdf8470d4..92677c4f307 100644
--- a/sys/dev/isa/mcdreg.h
+++ b/sys/dev/isa/mcdreg.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: mcdreg.h,v 1.2 1997/11/07 08:07:05 niklas Exp $ */
/* $NetBSD: mcdreg.h,v 1.7 1995/07/10 01:27:27 cgd Exp $ */
/*
diff --git a/sys/dev/isa/pasreg.h b/sys/dev/isa/pasreg.h
index e1b5466e7fc..f8948f9f49e 100644
--- a/sys/dev/isa/pasreg.h
+++ b/sys/dev/isa/pasreg.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: pasreg.h,v 1.2 1997/11/07 08:07:06 niklas Exp $ */
/* $NetBSD: pasreg.h,v 1.2 1995/03/15 18:45:58 brezak Exp $ */
/* Port addresses and bit fields for the Media Vision Pro AudioSpectrum
diff --git a/sys/dev/isa/pnpdevs b/sys/dev/isa/pnpdevs
index bef1e5dda18..7551c243718 100644
--- a/sys/dev/isa/pnpdevs
+++ b/sys/dev/isa/pnpdevs
@@ -1,3 +1,5 @@
+# $OpenBSD: pnpdevs,v 1.2 1997/11/07 08:07:07 niklas Exp $
+
#--Interrupt Controllers--
# PNP0000 #AT Interrupt Controller
# PNP0001 #EISA Interrupt Controller
diff --git a/sys/dev/isa/pssreg.h b/sys/dev/isa/pssreg.h
index 017cb1a691c..5907d709ea9 100644
--- a/sys/dev/isa/pssreg.h
+++ b/sys/dev/isa/pssreg.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: pssreg.h,v 1.2 1997/11/07 08:07:09 niklas Exp $ */
/* $NetBSD: pssreg.h,v 1.2 1995/05/08 22:02:09 brezak Exp $ */
/*
diff --git a/sys/dev/isa/seagate.c b/sys/dev/isa/seagate.c
index 0f90e391bb4..7b99ea2e3f4 100644
--- a/sys/dev/isa/seagate.c
+++ b/sys/dev/isa/seagate.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: seagate.c,v 1.11 1997/11/07 08:07:10 niklas Exp $ */
+
/*
* ST01/02, Future Domain TMC-885, TMC-950 SCSI driver
*
diff --git a/sys/dev/isa/wdsreg.h b/sys/dev/isa/wdsreg.h
index 76ebabe0208..72b560f1545 100644
--- a/sys/dev/isa/wdsreg.h
+++ b/sys/dev/isa/wdsreg.h
@@ -1,3 +1,5 @@
+/* $OpenBSD: wdsreg.h,v 1.4 1997/11/07 08:07:11 niklas Exp $ */
+
typedef u_int8_t physaddr[3];
typedef u_int8_t physlen[3];
#define ltophys _lto3b
diff --git a/sys/dev/isa/wssreg.h b/sys/dev/isa/wssreg.h
index 63566e97349..d4c37b46c1c 100644
--- a/sys/dev/isa/wssreg.h
+++ b/sys/dev/isa/wssreg.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: wssreg.h,v 1.3 1997/11/07 08:07:12 niklas Exp $ */
/* $NetBSD: wssreg.h,v 1.3 1995/07/07 02:15:15 brezak Exp $ */
/*
diff --git a/sys/dev/isa/wtreg.h b/sys/dev/isa/wtreg.h
index 5cf2d773752..d906715f6b8 100644
--- a/sys/dev/isa/wtreg.h
+++ b/sys/dev/isa/wtreg.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: wtreg.h,v 1.2 1997/11/07 08:07:13 niklas Exp $ */
/* $NetBSD: wtreg.h,v 1.5 1994/10/27 04:18:33 cgd Exp $ */
/*
diff --git a/sys/dev/microcode/Makefile.inc b/sys/dev/microcode/Makefile.inc
index 249ff95be9a..d0074735511 100644
--- a/sys/dev/microcode/Makefile.inc
+++ b/sys/dev/microcode/Makefile.inc
@@ -1,2 +1,4 @@
+# $OpenBSD: Makefile.inc,v 1.3 1997/11/07 08:07:15 niklas Exp $
+
.include "$S/dev/microcode/aic7xxx/Makefile.inc"
.include "$S/dev/microcode/ncr53cxxx/Makefile.inc"
diff --git a/sys/dev/microcode/aic7xxx/aic7xxx_reg.h b/sys/dev/microcode/aic7xxx/aic7xxx_reg.h
index e589393d9de..b29f23efd03 100644
--- a/sys/dev/microcode/aic7xxx/aic7xxx_reg.h
+++ b/sys/dev/microcode/aic7xxx/aic7xxx_reg.h
@@ -1,3 +1,5 @@
+/* $OpenBSD: aic7xxx_reg.h,v 1.3 1997/11/07 08:07:16 niklas Exp $*/
+
/*
* Aic7xxx register and scratch ram definitions.
*
@@ -28,7 +30,6 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: aic7xxx_reg.h,v 1.2 1996/06/27 21:15:54 shawn Exp $
*/
/*
diff --git a/sys/dev/microcode/ncr53cxxx/Makefile.inc b/sys/dev/microcode/ncr53cxxx/Makefile.inc
index 65e531dbb83..d4affe41bf6 100644
--- a/sys/dev/microcode/ncr53cxxx/Makefile.inc
+++ b/sys/dev/microcode/ncr53cxxx/Makefile.inc
@@ -1,3 +1,4 @@
+# $OpenBSD: Makefile.inc,v 1.3 1997/11/07 08:07:17 niklas Exp $
# $NetBSD: Makefile.inc,v 1.4 1996/05/20 00:48:43 thorpej Exp $
.if target(ncr53cxxx.o)
diff --git a/sys/dev/mulaw.c b/sys/dev/mulaw.c
index c20a173ef40..dd865ba9d89 100644
--- a/sys/dev/mulaw.c
+++ b/sys/dev/mulaw.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: mulaw.c,v 1.2 1997/11/07 08:06:36 niklas Exp $ */
+
/*
* Copyright (c) 1991-1993 Regents of the University of California.
* All rights reserved.
diff --git a/sys/dev/ofw/files.ofw b/sys/dev/ofw/files.ofw
index 799d1783bb9..a8a6a07d2aa 100644
--- a/sys/dev/ofw/files.ofw
+++ b/sys/dev/ofw/files.ofw
@@ -1,3 +1,5 @@
+# $OpenBSD: files.ofw,v 1.2 1997/11/07 08:07:19 niklas Exp $
+
#
# First cut on Openfirmware interface
#
diff --git a/sys/dev/ofw/ofbus.c b/sys/dev/ofw/ofbus.c
index 1f335dff3dc..54827495280 100644
--- a/sys/dev/ofw/ofbus.c
+++ b/sys/dev/ofw/ofbus.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: ofbus.c,v 1.2 1997/11/07 08:07:20 niklas Exp $ */
/* $NetBSD: ofbus.c,v 1.3 1996/10/13 01:38:11 christos Exp $ */
/*
diff --git a/sys/dev/ofw/ofcons.c b/sys/dev/ofw/ofcons.c
index 58883cfc0b1..addc97fb72b 100644
--- a/sys/dev/ofw/ofcons.c
+++ b/sys/dev/ofw/ofcons.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: ofcons.c,v 1.2 1997/11/07 08:07:21 niklas Exp $ */
/* $NetBSD: ofcons.c,v 1.3 1996/10/13 01:38:11 christos Exp $ */
/*
diff --git a/sys/dev/ofw/ofdisk.c b/sys/dev/ofw/ofdisk.c
index 819b2280bf9..132f87017a6 100644
--- a/sys/dev/ofw/ofdisk.c
+++ b/sys/dev/ofw/ofdisk.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: ofdisk.c,v 1.3 1997/11/07 08:07:22 niklas Exp $ */
/* $NetBSD: ofdisk.c,v 1.3 1996/10/13 01:38:13 christos Exp $ */
/*
diff --git a/sys/dev/ofw/ofnet.c b/sys/dev/ofw/ofnet.c
index 6dc62575198..5e3e0b600a3 100644
--- a/sys/dev/ofw/ofnet.c
+++ b/sys/dev/ofw/ofnet.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: ofnet.c,v 1.2 1997/11/07 08:07:22 niklas Exp $ */
/* $NetBSD: ofnet.c,v 1.4 1996/10/16 19:33:21 ws Exp $ */
/*
diff --git a/sys/dev/ofw/ofrtc.c b/sys/dev/ofw/ofrtc.c
index d382c5fbb52..e05cc8061d7 100644
--- a/sys/dev/ofw/ofrtc.c
+++ b/sys/dev/ofw/ofrtc.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: ofrtc.c,v 1.2 1997/11/07 08:07:23 niklas Exp $ */
/* $NetBSD: ofrtc.c,v 1.3 1996/10/13 01:38:14 christos Exp $ */
/*
diff --git a/sys/dev/ofw/openfirm.h b/sys/dev/ofw/openfirm.h
index 25f5a494f5e..386239df8ec 100644
--- a/sys/dev/ofw/openfirm.h
+++ b/sys/dev/ofw/openfirm.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: openfirm.h,v 1.2 1997/11/07 08:07:24 niklas Exp $ */
/* $NetBSD: openfirm.h,v 1.1 1996/09/30 16:35:10 ws Exp $ */
/*
diff --git a/sys/dev/pci/README b/sys/dev/pci/README
index 186e9b00e41..7151b10fd88 100644
--- a/sys/dev/pci/README
+++ b/sys/dev/pci/README
@@ -1,3 +1,4 @@
+$OpenBSD: README,v 1.2 1997/11/07 08:07:26 niklas Exp $
$NetBSD: README,v 1.2 1994/10/27 04:21:29 cgd Exp $
This directory contains files which are used during PCI configuration
diff --git a/sys/dev/pci/devlist2h.awk b/sys/dev/pci/devlist2h.awk
index 7618cc4f60b..2afb16afbe3 100644
--- a/sys/dev/pci/devlist2h.awk
+++ b/sys/dev/pci/devlist2h.awk
@@ -1,4 +1,5 @@
#! /usr/bin/awk -f
+# $OpenBSD: devlist2h.awk,v 1.3 1997/11/07 08:07:26 niklas Exp $
# $NetBSD: devlist2h.awk,v 1.2 1996/01/22 21:08:09 cgd Exp $
#
# Copyright (c) 1995, 1996 Christopher G. Demetriou
diff --git a/sys/dev/pci/if_ep_pci.c b/sys/dev/pci/if_ep_pci.c
index 6fec8862f49..deec641fb9a 100644
--- a/sys/dev/pci/if_ep_pci.c
+++ b/sys/dev/pci/if_ep_pci.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: if_ep_pci.c,v 1.11 1997/11/07 08:07:27 niklas Exp $ */
/* $NetBSD: if_ep_pci.c,v 1.13 1996/10/21 22:56:38 thorpej Exp $ */
/*
diff --git a/sys/dev/pci/if_le_pci.c b/sys/dev/pci/if_le_pci.c
index 6c7c9512959..215f4f74908 100644
--- a/sys/dev/pci/if_le_pci.c
+++ b/sys/dev/pci/if_le_pci.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: if_le_pci.c,v 1.7 1997/11/07 08:07:28 niklas Exp $ */
/* $NetBSD: if_le_pci.c,v 1.13 1996/10/25 21:33:32 cgd Exp $ */
/*-
diff --git a/sys/dev/pci/if_levar.h b/sys/dev/pci/if_levar.h
index d24222545d0..59e1b7f338d 100644
--- a/sys/dev/pci/if_levar.h
+++ b/sys/dev/pci/if_levar.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: if_levar.h,v 1.4 1997/11/07 08:07:29 niklas Exp $ */
/* $NetBSD: if_levar.h,v 1.3 1996/10/21 22:56:46 thorpej Exp $ */
/*
diff --git a/sys/dev/pci/pcidevs b/sys/dev/pci/pcidevs
index b493197d8ed..e143a0eb43a 100644
--- a/sys/dev/pci/pcidevs
+++ b/sys/dev/pci/pcidevs
@@ -1,4 +1,6 @@
-$NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $
+$OpenBSD: pcidevs,v 1.21 1997/11/07 08:07:30 niklas Exp $
+
+/* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */
/*
* Copyright (c) 1995, 1996 Christopher G. Demetriou
diff --git a/sys/dev/pcmcia/pcmcia.h b/sys/dev/pcmcia/pcmcia.h
index 67df7217ff5..6c12de44a1c 100644
--- a/sys/dev/pcmcia/pcmcia.h
+++ b/sys/dev/pcmcia/pcmcia.h
@@ -1,3 +1,5 @@
+/* $OpenBSD: pcmcia.h,v 1.2 1997/11/07 08:07:32 niklas Exp $ */
+
#ifndef __PCMCIA_H__
#define __PCMCIA_H__
diff --git a/sys/dev/pcmcia/pcmcia_conf.c b/sys/dev/pcmcia/pcmcia_conf.c
index d7b07b5aec7..c79d3623289 100644
--- a/sys/dev/pcmcia/pcmcia_conf.c
+++ b/sys/dev/pcmcia/pcmcia_conf.c
@@ -1,4 +1,4 @@
-/* $Id: pcmcia_conf.c,v 1.5 1997/08/19 21:59:50 angelos Exp $ */
+/* $OpenBSD: pcmcia_conf.c,v 1.6 1997/11/07 08:07:33 niklas Exp $ */
/*
* Copyright (c) 1996 John T. Kohl. All rights reserved.
* Copyright (c) 1994 Stefan Grefen. All rights reserved.
diff --git a/sys/dev/pcmcia/pcmcia_ioctl.h b/sys/dev/pcmcia/pcmcia_ioctl.h
index dd8b9e6174e..11d8a644a56 100644
--- a/sys/dev/pcmcia/pcmcia_ioctl.h
+++ b/sys/dev/pcmcia/pcmcia_ioctl.h
@@ -1,4 +1,4 @@
-/* $Id: pcmcia_ioctl.h,v 1.2 1996/04/29 14:17:25 hvozda Exp $ */
+/* $OpenBSD: pcmcia_ioctl.h,v 1.3 1997/11/07 08:07:34 niklas Exp $ */
/*
* Copyright (c) 1993, 1994 Stefan Grefen. All rights reserved.
*
diff --git a/sys/dev/pcmcia/pcmciareg.h b/sys/dev/pcmcia/pcmciareg.h
index f3f4446c37d..840d745aba3 100644
--- a/sys/dev/pcmcia/pcmciareg.h
+++ b/sys/dev/pcmcia/pcmciareg.h
@@ -1,4 +1,4 @@
-/* $Id: pcmciareg.h,v 1.1 1996/04/29 14:17:35 hvozda Exp $ */
+/* $OpenBSD: pcmciareg.h,v 1.2 1997/11/07 08:07:35 niklas Exp $ */
/*
* This file was apparently first written by Stefan Grefen, although it
* contained no copyright notice at the time.
diff --git a/sys/dev/pcmcia/pcmciavar.h b/sys/dev/pcmcia/pcmciavar.h
index 6260b30d41d..58872f0722c 100644
--- a/sys/dev/pcmcia/pcmciavar.h
+++ b/sys/dev/pcmcia/pcmciavar.h
@@ -1,4 +1,4 @@
-/* $Id: pcmciavar.h,v 1.4 1997/03/01 22:42:59 niklas Exp $ */
+/* $OpenBSD: pcmciavar.h,v 1.5 1997/11/07 08:07:36 niklas Exp $ */
/*
* Copyright (c) 1995,1996 John T. Kohl. All rights reserved.
* Copyright (c) 1993, 1994 Stefan Grefen. All rights reserved.
diff --git a/sys/dev/rcons/files.rcons b/sys/dev/rcons/files.rcons
index 540798588bd..c12adc496e9 100644
--- a/sys/dev/rcons/files.rcons
+++ b/sys/dev/rcons/files.rcons
@@ -1,3 +1,4 @@
+# $OpenBSD: files.rcons,v 1.3 1997/11/07 08:07:37 niklas Exp $
# $NetBSD: files.rcons,v 1.2 1996/04/11 21:54:38 cgd Exp $
#
# Configuration file for RASTER Console.
diff --git a/sys/dev/rcons/raster.h b/sys/dev/rcons/raster.h
index e8868ca27c5..c8e4f54f92b 100644
--- a/sys/dev/rcons/raster.h
+++ b/sys/dev/rcons/raster.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: raster.h,v 1.3 1997/11/07 08:07:38 niklas Exp $ */
/* $NetBSD: raster.h,v 1.3 1995/11/24 23:50:51 cgd Exp $ */
/*-
diff --git a/sys/dev/rcons/raster_text.c b/sys/dev/rcons/raster_text.c
index ec0e140728d..5b0188c1296 100644
--- a/sys/dev/rcons/raster_text.c
+++ b/sys/dev/rcons/raster_text.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: raster_text.c,v 1.3 1997/11/07 08:07:39 niklas Exp $ */
/* $NetBSD: raster_text.c,v 1.3 1995/11/24 23:50:56 cgd Exp $ */
/*-
diff --git a/sys/dev/rcons/rcons_subr.c b/sys/dev/rcons/rcons_subr.c
index dcc6cb984c0..f4e05a1d5e3 100644
--- a/sys/dev/rcons/rcons_subr.c
+++ b/sys/dev/rcons/rcons_subr.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: rcons_subr.c,v 1.2 1997/11/07 08:07:40 niklas Exp $ */
/* $NetBSD: rcons_subr.c,v 1.2 1995/10/04 23:57:26 pk Exp $ */
/*
diff --git a/sys/dev/rcons/rcons_subr.h b/sys/dev/rcons/rcons_subr.h
index f0937126772..0224ca0f5d6 100644
--- a/sys/dev/rcons/rcons_subr.h
+++ b/sys/dev/rcons/rcons_subr.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: rcons_subr.h,v 1.2 1997/11/07 08:07:42 niklas Exp $ */
/* $NetBSD: rcons_subr.h,v 1.1 1995/10/04 23:57:28 pk Exp $ */
/*
diff --git a/sys/dev/tc/asc_ioasic.c b/sys/dev/tc/asc_ioasic.c
index c35ffb927ad..894d94aebcd 100644
--- a/sys/dev/tc/asc_ioasic.c
+++ b/sys/dev/tc/asc_ioasic.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: asc_ioasic.c,v 1.3 1997/11/07 08:07:43 niklas Exp $ */
/* $NetBSD: asc_ioasic.c,v 1.3 1996/10/13 01:38:36 christos Exp $ */
/*
diff --git a/sys/dev/tc/asc_tc.c b/sys/dev/tc/asc_tc.c
index 42417f12213..e17cdd6cbf8 100644
--- a/sys/dev/tc/asc_tc.c
+++ b/sys/dev/tc/asc_tc.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: asc_tc.c,v 1.2 1997/11/07 08:07:44 niklas Exp $ */
/* $NetBSD: asc_tc.c,v 1.4 1996/10/13 01:38:37 christos Exp $ */
/*
diff --git a/sys/dev/tc/ascvar.h b/sys/dev/tc/ascvar.h
index 966d0480a03..db640b4ca50 100644
--- a/sys/dev/tc/ascvar.h
+++ b/sys/dev/tc/ascvar.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: ascvar.h,v 1.2 1997/11/07 08:07:45 niklas Exp $ */
/* $NetBSD: ascvar.h,v 1.1 1996/09/25 21:07:56 jonathan Exp $ */
diff --git a/sys/dev/tc/if_fta.c b/sys/dev/tc/if_fta.c
index d0307372127..e261c1d59eb 100644
--- a/sys/dev/tc/if_fta.c
+++ b/sys/dev/tc/if_fta.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: if_fta.c,v 1.3 1997/11/07 08:07:46 niklas Exp $ */
/* $NetBSD: if_fta.c,v 1.7 1996/10/22 21:37:26 cgd Exp $ */
/*-
diff --git a/sys/dev/tc/if_le_dec.c b/sys/dev/tc/if_le_dec.c
index 50094f17fdb..8b70a0ebf6e 100644
--- a/sys/dev/tc/if_le_dec.c
+++ b/sys/dev/tc/if_le_dec.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: if_le_dec.c,v 1.3 1997/11/07 08:07:47 niklas Exp $ */
/* $NetBSD: if_le_dec.c,v 1.3 1996/10/13 01:38:38 christos Exp $ */
/*-
diff --git a/sys/dev/tc/if_le_ibus.c b/sys/dev/tc/if_le_ibus.c
index 904e472bcf9..6ab7fca3f4c 100644
--- a/sys/dev/tc/if_le_ibus.c
+++ b/sys/dev/tc/if_le_ibus.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: if_le_ibus.c,v 1.2 1997/11/07 08:07:48 niklas Exp $ */
/* $NetBSD: if_le_ibus.c,v 1.3 1996/05/20 23:19:16 jonathan Exp $ */
/*
diff --git a/sys/dev/tc/if_le_ioasic.c b/sys/dev/tc/if_le_ioasic.c
index a0c22099583..4b0b11be703 100644
--- a/sys/dev/tc/if_le_ioasic.c
+++ b/sys/dev/tc/if_le_ioasic.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: if_le_ioasic.c,v 1.3 1997/11/07 08:07:49 niklas Exp $ */
/* $NetBSD: if_le_ioasic.c,v 1.2 1996/05/07 02:24:56 thorpej Exp $ */
/*
diff --git a/sys/dev/tc/if_le_tc.c b/sys/dev/tc/if_le_tc.c
index e329a3da2e3..fac921d5338 100644
--- a/sys/dev/tc/if_le_tc.c
+++ b/sys/dev/tc/if_le_tc.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: if_le_tc.c,v 1.3 1997/11/07 08:07:50 niklas Exp $ */
/* $NetBSD: if_le_tc.c,v 1.2 1996/05/07 02:24:57 thorpej Exp $ */
/*
diff --git a/sys/dev/tc/if_levar.h b/sys/dev/tc/if_levar.h
index a8180677036..818b6d08ecb 100644
--- a/sys/dev/tc/if_levar.h
+++ b/sys/dev/tc/if_levar.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: if_levar.h,v 1.4 1997/11/07 08:07:51 niklas Exp $ */
/* $NetBSD: if_levar.h,v 1.3 1996/05/07 02:24:58 thorpej Exp $ */
/*-
diff --git a/sys/dev/tc/ioasicvar.h b/sys/dev/tc/ioasicvar.h
index ed312acd9df..c3d369f1fd7 100644
--- a/sys/dev/tc/ioasicvar.h
+++ b/sys/dev/tc/ioasicvar.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: ioasicvar.h,v 1.3 1997/11/07 08:07:51 niklas Exp $ */
/* $NetBSD: ioasicvar.h,v 1.2 1996/03/17 21:37:45 jonathan Exp $ */
/*
diff --git a/sys/dev/tc/tcreg.h b/sys/dev/tc/tcreg.h
index 631185ace69..7cfe4de700f 100644
--- a/sys/dev/tc/tcreg.h
+++ b/sys/dev/tc/tcreg.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: tcreg.h,v 1.2 1997/11/07 08:07:52 niklas Exp $ */
/* $NetBSD: tcreg.h,v 1.1 1995/12/20 00:48:36 cgd Exp $ */
/*
diff --git a/sys/dev/vndioctl.h b/sys/dev/vndioctl.h
index 0b7ec9479fe..d11c3e01fc9 100644
--- a/sys/dev/vndioctl.h
+++ b/sys/dev/vndioctl.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: vndioctl.h,v 1.2 1997/11/07 08:06:37 niklas Exp $ */
/* $NetBSD: vndioctl.h,v 1.5 1995/01/25 04:46:30 cgd Exp $ */
/*