Removed now-unused #includes of <machine/cpu.h>. They were for bootverbose

being declared in the wrong place.

6 files changed, 6 insertions, 13 deletions

diff --git a/sys/i386/isa/aha1542.c b/sys/i386/isa/aha1542.c
index 729b31d..5447efc 100644
--- a/sys/i386/isa/aha1542.c
+++ b/sys/i386/isa/aha1542.c
@@ -12,7 +12,7 @@
  * on the understanding that TFS is not responsible for the correct
  * functioning of this software in any circumstances.
  *
- *      $Id: aha1542.c,v 1.56 1996/03/10 07:04:42 gibbs Exp $
+ *      $Id: aha1542.c,v 1.57 1996/03/31 18:19:38 gibbs Exp $
  */
 
 /*
@@ -32,7 +32,6 @@
 #include <sys/proc.h>
 
 #include <machine/clock.h>
-#include <machine/cpu.h>	/* XXX for bootverbose: a funny place */
 #include <machine/stdarg.h>
 
 #include <vm/vm.h>
diff --git a/sys/i386/isa/diskslice_machdep.c b/sys/i386/isa/diskslice_machdep.c
index 481cef1..4610e5f 100644
--- a/sys/i386/isa/diskslice_machdep.c
+++ b/sys/i386/isa/diskslice_machdep.c
@@ -35,7 +35,7 @@
  *
  *	from: @(#)ufs_disksubr.c	7.16 (Berkeley) 5/4/91
  *	from: ufs_disksubr.c,v 1.8 1994/06/07 01:21:39 phk Exp $
- *	$Id: diskslice_machdep.c,v 1.18 1996/03/01 19:00:53 dyson Exp $
+ *	$Id: diskslice_machdep.c,v 1.19 1996/03/02 01:49:38 dyson Exp $
  */
 
 #include <stddef.h>
@@ -48,7 +48,6 @@
 #include <sys/malloc.h>
 #include <sys/syslog.h>
 #include <sys/systm.h>
-#include <machine/cpu.h>
 
 #define TRACE(str)	do { if (dsi_debug) printf str; } while (0)
 
diff --git a/sys/i386/isa/fd.c b/sys/i386/isa/fd.c
index 91e6066..7144602 100644
--- a/sys/i386/isa/fd.c
+++ b/sys/i386/isa/fd.c
@@ -43,7 +43,7 @@
  * SUCH DAMAGE.
  *
  *	from:	@(#)fd.c	7.4 (Berkeley) 5/25/91
- *	$Id: fd.c,v 1.84 1996/04/02 04:51:04 scrappy Exp $
+ *	$Id: fd.c,v 1.85 1996/04/07 14:46:42 bde Exp $
  *
  */
 
@@ -65,7 +65,6 @@
 #include <machine/ioctl_fd.h>
 #include <sys/disklabel.h>
 #include <sys/diskslice.h>
-#include <machine/cpu.h>
 #include <sys/buf.h>
 #include <sys/uio.h>
 #include <sys/malloc.h>
diff --git a/sys/i386/isa/isa.c b/sys/i386/isa/isa.c
index 2701995..c414461 100644
--- a/sys/i386/isa/isa.c
+++ b/sys/i386/isa/isa.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)isa.c	7.2 (Berkeley) 5/13/91
- *	$Id: isa.c,v 1.64 1996/03/10 02:10:27 jkh Exp $
+ *	$Id: isa.c,v 1.65 1996/03/10 07:04:44 gibbs Exp $
  */
 
 /*
@@ -57,7 +57,6 @@
 #include <vm/vm.h>
 #include <vm/vm_param.h>
 #include <vm/pmap.h>
-#include <machine/cpu.h>
 #include <i386/isa/isa_device.h>
 #include <i386/isa/isa.h>
 #include <i386/isa/icu.h>
diff --git a/sys/i386/isa/mcd.c b/sys/i386/isa/mcd.c
index a364c04..903f5c7 100644
--- a/sys/i386/isa/mcd.c
+++ b/sys/i386/isa/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.74 1996/03/17 13:33:42 ache Exp $
+ *	$Id: mcd.c,v 1.75 1996/03/28 14:28:45 scrappy Exp $
  */
 static char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore";
 
@@ -62,7 +62,6 @@ static char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore";
 #include <sys/disklabel.h>
 #include <sys/devconf.h>
 #include <sys/kernel.h>
-#include <machine/cpu.h>
 #ifdef DEVFS
 #include <sys/devfsext.h>
 #endif /*DEVFS*/
diff --git a/sys/i386/isa/pcibus.c b/sys/i386/isa/pcibus.c
index b4c3b8a..be2e364 100644
--- a/sys/i386/isa/pcibus.c
+++ b/sys/i386/isa/pcibus.c
@@ -1,6 +1,6 @@
 /**************************************************************************
 **
-**  $Id: pcibus.c,v 1.21 1995/12/16 00:27:59 bde Exp $
+**  $Id: pcibus.c,v 1.22 1996/03/29 15:01:51 bde Exp $
 **
 **  pci bus subroutines for i386 architecture.
 **
@@ -41,8 +41,6 @@
 #include <sys/systm.h>
 #include <sys/kernel.h>
 
-#include <machine/cpu.h> /* bootverbose */
-
 #include <i386/isa/icu.h>
 #include <i386/isa/isa.h>
 #include <i386/isa/isa_device.h>