- Fixed warnings.

- Removed unnecessary include files.

11 files changed, 4 insertions, 51 deletions

diff --git a/sys/pc98/cbus/gdc.c b/sys/pc98/cbus/gdc.c
index e8c1d7e..d3f6d92 100644
--- a/sys/pc98/cbus/gdc.c
+++ b/sys/pc98/cbus/gdc.c
@@ -39,7 +39,6 @@
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/bus.h>
-#include <sys/malloc.h>
 
 #include <vm/vm.h>
 #include <vm/pmap.h>
diff --git a/sys/pc98/cbus/olpt.c b/sys/pc98/cbus/olpt.c
index c666990..43ce718 100644
--- a/sys/pc98/cbus/olpt.c
+++ b/sys/pc98/cbus/olpt.c
@@ -117,15 +117,6 @@
 #include <machine/clock.h>
 #include <machine/lpt.h>
 
-#include <vm/vm.h>
-#include <vm/vm_param.h>
-#include <vm/pmap.h>
-
-#ifdef PC98
-#include <pc98/pc98/pc98.h>
-#else
-#include <i386/isa/isa.h>
-#endif
 #include <i386/isa/isa_device.h>
 #include <i386/isa/lptreg.h>
 
@@ -814,7 +805,9 @@ lptwrite(dev_t dev, struct uio * uio, int ioflag)
 static void
 lptintr(int unit)
 {
+#if defined(INET) || !defined(PC98)
 	struct lpt_softc *sc = lpt_sc + unit;
+#endif
 #ifndef PC98
 	int port = sc->sc_port, sts;
 	int i;
diff --git a/sys/pc98/cbus/pckbd.c b/sys/pc98/cbus/pckbd.c
index 95ce3bd..cefe8bf 100644
--- a/sys/pc98/cbus/pckbd.c
+++ b/sys/pc98/cbus/pckbd.c
@@ -36,12 +36,7 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
-#include <sys/conf.h>
-#include <sys/proc.h>
 #include <sys/module.h>
-#include <sys/tty.h>
-#include <sys/fcntl.h>
-#include <sys/malloc.h>
 #include <sys/bus.h>
 #include <machine/bus.h>
 #include <sys/rman.h>
@@ -51,15 +46,10 @@
 #include <dev/kbd/kbdreg.h>
 
 #include <pc98/pc98/pc98.h>
-#include <pc98/pc98/pc98_machdep.h>
 
 #include <isa/isavar.h>
 #include <machine/lock.h>
 
-#ifdef __i386__
-#include <i386/isa/isa_device.h>
-#endif
-
 #define DRIVER_NAME		"pckbd"
 
 /* device configuration flags */
diff --git a/sys/pc98/cbus/scgdcrndr.c b/sys/pc98/cbus/scgdcrndr.c
index ba28a70..df4d0ee 100644
--- a/sys/pc98/cbus/scgdcrndr.c
+++ b/sys/pc98/cbus/scgdcrndr.c
@@ -34,15 +34,11 @@
 #if NSC > 0 && NGDC > 0
 
 #include <sys/param.h>
-#include <sys/systm.h>
 #include <sys/kernel.h>
 
 #include <machine/console.h>
 #include <machine/md_var.h>
 
-#include <pc98/pc98/pc98.h>
-#include <pc98/pc98/pc98_machdep.h>
-
 #include <dev/fb/fbreg.h>
 #include <dev/syscons/syscons.h>
 
diff --git a/sys/pc98/cbus/scvtb.c b/sys/pc98/cbus/scvtb.c
index 6be4a99..1c0be2c 100644
--- a/sys/pc98/cbus/scvtb.c
+++ b/sys/pc98/cbus/scvtb.c
@@ -33,7 +33,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/malloc.h>
 
 #include <machine/console.h>
diff --git a/sys/pc98/pc98/olpt.c b/sys/pc98/pc98/olpt.c
index c666990..43ce718 100644
--- a/sys/pc98/pc98/olpt.c
+++ b/sys/pc98/pc98/olpt.c
@@ -117,15 +117,6 @@
 #include <machine/clock.h>
 #include <machine/lpt.h>
 
-#include <vm/vm.h>
-#include <vm/vm_param.h>
-#include <vm/pmap.h>
-
-#ifdef PC98
-#include <pc98/pc98/pc98.h>
-#else
-#include <i386/isa/isa.h>
-#endif
 #include <i386/isa/isa_device.h>
 #include <i386/isa/lptreg.h>
 
@@ -814,7 +805,9 @@ lptwrite(dev_t dev, struct uio * uio, int ioflag)
 static void
 lptintr(int unit)
 {
+#if defined(INET) || !defined(PC98)
 	struct lpt_softc *sc = lpt_sc + unit;
+#endif
 #ifndef PC98
 	int port = sc->sc_port, sts;
 	int i;
diff --git a/sys/pc98/pc98/pc98_machdep.c b/sys/pc98/pc98/pc98_machdep.c
index 163a8b9..8b3e016 100644
--- a/sys/pc98/pc98/pc98_machdep.c
+++ b/sys/pc98/pc98/pc98_machdep.c
@@ -39,7 +39,6 @@
 #include <cam/cam.h>
 #include <cam/cam_ccb.h>
 
-#include <pc98/pc98/pc98.h>
 #include <pc98/pc98/pc98_machdep.h>
 
 extern	int Maxmem;
diff --git a/sys/pc98/pc98/pc98gdc.c b/sys/pc98/pc98/pc98gdc.c
index e8c1d7e..d3f6d92 100644
--- a/sys/pc98/pc98/pc98gdc.c
+++ b/sys/pc98/pc98/pc98gdc.c
@@ -39,7 +39,6 @@
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/bus.h>
-#include <sys/malloc.h>
 
 #include <vm/vm.h>
 #include <vm/pmap.h>
diff --git a/sys/pc98/pc98/pc98kbd.c b/sys/pc98/pc98/pc98kbd.c
index 95ce3bd..cefe8bf 100644
--- a/sys/pc98/pc98/pc98kbd.c
+++ b/sys/pc98/pc98/pc98kbd.c
@@ -36,12 +36,7 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
-#include <sys/conf.h>
-#include <sys/proc.h>
 #include <sys/module.h>
-#include <sys/tty.h>
-#include <sys/fcntl.h>
-#include <sys/malloc.h>
 #include <sys/bus.h>
 #include <machine/bus.h>
 #include <sys/rman.h>
@@ -51,15 +46,10 @@
 #include <dev/kbd/kbdreg.h>
 
 #include <pc98/pc98/pc98.h>
-#include <pc98/pc98/pc98_machdep.h>
 
 #include <isa/isavar.h>
 #include <machine/lock.h>
 
-#ifdef __i386__
-#include <i386/isa/isa_device.h>
-#endif
-
 #define DRIVER_NAME		"pckbd"
 
 /* device configuration flags */
diff --git a/sys/pc98/pc98/scgdcrndr.c b/sys/pc98/pc98/scgdcrndr.c
index ba28a70..df4d0ee 100644
--- a/sys/pc98/pc98/scgdcrndr.c
+++ b/sys/pc98/pc98/scgdcrndr.c
@@ -34,15 +34,11 @@
 #if NSC > 0 && NGDC > 0
 
 #include <sys/param.h>
-#include <sys/systm.h>
 #include <sys/kernel.h>
 
 #include <machine/console.h>
 #include <machine/md_var.h>
 
-#include <pc98/pc98/pc98.h>
-#include <pc98/pc98/pc98_machdep.h>
-
 #include <dev/fb/fbreg.h>
 #include <dev/syscons/syscons.h>
 
diff --git a/sys/pc98/pc98/scvtbpc98.c b/sys/pc98/pc98/scvtbpc98.c
index 6be4a99..1c0be2c 100644
--- a/sys/pc98/pc98/scvtbpc98.c
+++ b/sys/pc98/pc98/scvtbpc98.c
@@ -33,7 +33,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/malloc.h>
 
 #include <machine/console.h>