9 files changed, 19 insertions, 29 deletions

diff --git a/sys/dev/fdc/fdcreg.h b/sys/dev/fdc/fdcreg.h
index 948f566dfda8..84dbf7505550 100644
--- a/sys/dev/fdc/fdcreg.h
+++ b/sys/dev/fdc/fdcreg.h
@@ -30,14 +30,8 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	@(#)fdreg.h	7.1 (Berkeley) 5/9/91
- *
- * PATCHES MAGIC                LEVEL   PATCH THAT GOT US HERE
- * --------------------         -----   ----------------------
- * CURRENT PATCH LEVEL:         1       00153
- * --------------------         -----   ----------------------
- *
- * 20 Apr 93	Julian Elischer		Heavily re worked, see notes below
+ *	from: @(#)fdreg.h	7.1 (Berkeley) 5/9/91
+ *	$Id$
  */
 
 /*
diff --git a/sys/dev/ic/i8237.h b/sys/dev/ic/i8237.h
index dc269f2cfc2d..2199e732a02c 100644
--- a/sys/dev/ic/i8237.h
+++ b/sys/dev/ic/i8237.h
@@ -1,5 +1,7 @@
 /*
  * Intel 8237 DMA Controller
+ *
+ *	$Id$
  */
 
 #define	DMA37MD_SINGLE	0x40	/* single pass mode */
diff --git a/sys/dev/ic/nec765.h b/sys/dev/ic/nec765.h
index b84b46e799cf..1895db7603a7 100644
--- a/sys/dev/ic/nec765.h
+++ b/sys/dev/ic/nec765.h
@@ -30,7 +30,8 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	@(#)nec765.h	7.1 (Berkeley) 5/9/91
+ *	from: @(#)nec765.h	7.1 (Berkeley) 5/9/91
+ *	$Id$
  */
 
 /*
diff --git a/sys/dev/ic/ns16550.h b/sys/dev/ic/ns16550.h
index e20e9aa58a89..ff59757a5f73 100644
--- a/sys/dev/ic/ns16550.h
+++ b/sys/dev/ic/ns16550.h
@@ -30,7 +30,8 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	@(#)ns16550.h	7.1 (Berkeley) 5/9/91
+ *	from: @(#)ns16550.h	7.1 (Berkeley) 5/9/91
+ *	$Id$
  */
 
 /*
diff --git a/sys/dev/kbd/kbdtables.h b/sys/dev/kbd/kbdtables.h
index dedfc677e6fb..5acb9af22182 100644
--- a/sys/dev/kbd/kbdtables.h
+++ b/sys/dev/kbd/kbdtables.h
@@ -12,6 +12,8 @@
  *	Søren Schmidt 		Email:	sos@kmd-ac.dk
  *	Tritonvej 36		UUCP:	...uunet!dkuug!kmd-ac!sos
  *	DK9210 Aalborg SO	Phone:  +45 9814 8076
+ *
+ *	$Id$
  */
 
 #define META 0x80       	/* eight bit for emacs META-key */
diff --git a/sys/dev/mcd/mcd.c b/sys/dev/mcd/mcd.c
index b301a48b89ce..3064d08ed30e 100644
--- a/sys/dev/mcd/mcd.c
+++ b/sys/dev/mcd/mcd.c
@@ -34,9 +34,8 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: mcd.c,v 1.1 1993/10/12 06:08:29 rgrimes Exp $
  */
-/*static char rcsid[] = "from: /sys/i386/isa/RCS/mcd.c,v 2.1 1993/09/24 21:23:13 root Exp root";*/
 static char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore";
 
 #include "mcd.h"
diff --git a/sys/dev/sio/sio.c b/sys/dev/sio/sio.c
index 64ef339f6371..055a5e807d54 100644
--- a/sys/dev/sio/sio.c
+++ b/sys/dev/sio/sio.c
@@ -30,18 +30,9 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	From:
- *	@(#)com.c	7.5 (Berkeley) 5/16/91
- *
- * 27 May 93	Bruce Evans		From com-0.2 package, fast interrupt
- *					com port driver.
- * 27 May 93	Guido van Rooij		Ported in Chris Demetriou's BIDIR
- *					code, add multiport support.
- * 27 May 93	Rodney W. Grimes	I then renamed it to sio.c for putting
- *					into the patch kit.  Added in sioselect
- *					from com.c.  Added port 4 support.
+ *	from: @(#)com.c	7.5 (Berkeley) 5/16/91
+ *	$Id$
  */
-static char rcsid[] = "$Header: /a/cvs/386BSD/src/sys/i386/isa/sio.c,v 1.10 1993/10/12 06:32:28 davidg Exp $";
 
 #include "sio.h"
 #if NSIO > 0
diff --git a/sys/dev/speaker/spkr.c b/sys/dev/speaker/spkr.c
index 04feb2f88493..7b82f16fabb0 100644
--- a/sys/dev/speaker/spkr.c
+++ b/sys/dev/speaker/spkr.c
@@ -5,6 +5,8 @@
  *      modified for 386bsd by Andrew A. Chernov <ache@astral.msk.su>
  *      386bsd only clean version, all SYSV stuff removed
  *      use hz value from param.c
+ *
+ *	$Id$
  */
 
 #include "speaker.h"
diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c
index 4c60968d5c50..237c32b31d8b 100644
--- a/sys/dev/syscons/syscons.c
+++ b/sys/dev/syscons/syscons.c
@@ -33,15 +33,13 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- */
-/*
+ *	from: @(#)pccons.c	5.11 (Berkeley) 5/21/91
+ *	from: @(#)syscons.c	1.0 930928
+ *	$Id$
+ *
  * Heavily modified by Søren Schmidt (sos@login.dkuug.dk) to provide:
  *
  * 	virtual consoles, SYSV ioctl's, ANSI emulation 
- *
- *	@(#)syscons.c	1.0 930928
- * Derived from:
- *	@(#)pccons.c	5.11 (Berkeley) 5/21/91
  */
 
 #define STAR_SAVER