From 36633bf49d579dc505c361e1ae5c924b7e363731 Mon Sep 17 00:00:00 2001
From: Bruce Evans <bde@FreeBSD.org>
Date: Mon, 14 Nov 1994 13:22:52 +0000
Subject: [PATCH] Undo a previous change.  <sys/disklabel.h> was broken, not
 these files.

---
 sys/amd64/amd64/machdep.c      | 3 +--
 sys/fs/specfs/spec_vnops.c     | 3 +--
 sys/i386/i386/machdep.c        | 3 +--
 sys/i386/isa/readMBR.c         | 3 +--
 sys/miscfs/specfs/spec_vnops.c | 3 +--
 sys/ufs/ffs/ffs_vfsops.c       | 3 +--
 sys/ufs/lfs/lfs_vfsops.c       | 3 +--
 7 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c
index c6a2c47b9d53..eedc448d102a 100644
--- a/sys/amd64/amd64/machdep.c
+++ b/sys/amd64/amd64/machdep.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)machdep.c	7.4 (Berkeley) 6/3/91
- *	$Id: machdep.c,v 1.87 1994/11/06 04:46:53 davidg Exp $
+ *	$Id: machdep.c,v 1.88 1994/11/07 03:51:32 phk Exp $
  */
 
 #include "npx.h"
@@ -1554,7 +1554,6 @@ Debugger(const char *msg)
 }
 #endif /* no DDB */
 
-#include <sys/dkbad.h>
 #include <sys/disklabel.h>
 #define b_cylin	b_resid
 /*
diff --git a/sys/fs/specfs/spec_vnops.c b/sys/fs/specfs/spec_vnops.c
index 93af810ae323..fba9392c30c9 100644
--- a/sys/fs/specfs/spec_vnops.c
+++ b/sys/fs/specfs/spec_vnops.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)spec_vnops.c	8.6 (Berkeley) 4/9/94
- * $Id: spec_vnops.c,v 1.7 1994/10/10 07:55:41 phk Exp $
+ * $Id: spec_vnops.c,v 1.8 1994/10/28 12:41:59 jkh Exp $
  */
 
 #include <sys/param.h>
@@ -47,7 +47,6 @@
 #include <sys/errno.h>
 #include <sys/ioctl.h>
 #include <sys/file.h>
-#include <sys/dkbad.h>
 #include <sys/disklabel.h>
 #include <miscfs/specfs/specdev.h>
 
diff --git a/sys/i386/i386/machdep.c b/sys/i386/i386/machdep.c
index c6a2c47b9d53..eedc448d102a 100644
--- a/sys/i386/i386/machdep.c
+++ b/sys/i386/i386/machdep.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)machdep.c	7.4 (Berkeley) 6/3/91
- *	$Id: machdep.c,v 1.87 1994/11/06 04:46:53 davidg Exp $
+ *	$Id: machdep.c,v 1.88 1994/11/07 03:51:32 phk Exp $
  */
 
 #include "npx.h"
@@ -1554,7 +1554,6 @@ Debugger(const char *msg)
 }
 #endif /* no DDB */
 
-#include <sys/dkbad.h>
 #include <sys/disklabel.h>
 #define b_cylin	b_resid
 /*
diff --git a/sys/i386/isa/readMBR.c b/sys/i386/isa/readMBR.c
index ab944e87d9c9..b6edfcf9bca0 100644
--- a/sys/i386/isa/readMBR.c
+++ b/sys/i386/isa/readMBR.c
@@ -15,13 +15,12 @@
  * written by julian elischer (julian@tfs.com)
  *
  *	@(#)readMBR.c	8.5 (tfs) 1/21/94
- * $Id: readMBR.c,v 1.2 1994/10/28 12:41:55 jkh Exp $
+ * $Id: readMBR.c,v 1.3 1994/11/08 10:35:52 phk Exp $
  */
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/buf.h>
-#include <sys/dkbad.h>
 #include <sys/disklabel.h>
 
 #define	b_cylinder	b_resid
diff --git a/sys/miscfs/specfs/spec_vnops.c b/sys/miscfs/specfs/spec_vnops.c
index 93af810ae323..fba9392c30c9 100644
--- a/sys/miscfs/specfs/spec_vnops.c
+++ b/sys/miscfs/specfs/spec_vnops.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)spec_vnops.c	8.6 (Berkeley) 4/9/94
- * $Id: spec_vnops.c,v 1.7 1994/10/10 07:55:41 phk Exp $
+ * $Id: spec_vnops.c,v 1.8 1994/10/28 12:41:59 jkh Exp $
  */
 
 #include <sys/param.h>
@@ -47,7 +47,6 @@
 #include <sys/errno.h>
 #include <sys/ioctl.h>
 #include <sys/file.h>
-#include <sys/dkbad.h>
 #include <sys/disklabel.h>
 #include <miscfs/specfs/specdev.h>
 
diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c
index ad3535613bdc..6ba504002de2 100644
--- a/sys/ufs/ffs/ffs_vfsops.c
+++ b/sys/ufs/ffs/ffs_vfsops.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ffs_vfsops.c	8.8 (Berkeley) 4/18/94
- * $Id: ffs_vfsops.c,v 1.10 1994/10/22 02:27:35 davidg Exp $
+ * $Id: ffs_vfsops.c,v 1.11 1994/10/28 12:42:03 jkh Exp $
  */
 
 #include <sys/param.h>
@@ -45,7 +45,6 @@
 #include <sys/buf.h>
 #include <sys/mbuf.h>
 #include <sys/file.h>
-#include <sys/dkbad.h>
 #include <sys/disklabel.h>
 #include <sys/ioctl.h>
 #include <sys/errno.h>
diff --git a/sys/ufs/lfs/lfs_vfsops.c b/sys/ufs/lfs/lfs_vfsops.c
index 8ea2da1c25fd..4ab96236973f 100644
--- a/sys/ufs/lfs/lfs_vfsops.c
+++ b/sys/ufs/lfs/lfs_vfsops.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)lfs_vfsops.c	8.7 (Berkeley) 4/16/94
- * $Id: lfs_vfsops.c,v 1.6 1994/09/21 03:47:39 wollman Exp $
+ * $Id: lfs_vfsops.c,v 1.7 1994/10/28 12:42:05 jkh Exp $
  */
 
 #include <sys/param.h>
@@ -44,7 +44,6 @@
 #include <sys/buf.h>
 #include <sys/mbuf.h>
 #include <sys/file.h>
-#include <sys/dkbad.h>
 #include <sys/disklabel.h>
 #include <sys/ioctl.h>
 #include <sys/errno.h>