diff options
| author | Noriaki Mitsunaga <non@FreeBSD.org> | 2000-10-30 12:21:19 +0000 |
|---|---|---|
| committer | Noriaki Mitsunaga <non@FreeBSD.org> | 2000-10-30 12:21:19 +0000 |
| commit | c868d858b46d17f21fd3ba0237994a0cd385913f (patch) | |
| tree | 1aff0adadf1d3bd026de2c1977c02f6ea0bd480b | |
| parent | 591c194a92c4fc725190afcaf2eecf34081e86fc (diff) | |
Notes
| -rw-r--r-- | sys/cam/scsi/scsi_low.c | 9 | ||||
| -rw-r--r-- | sys/cam/scsi/scsi_low_pisa.c | 13 |
2 files changed, 6 insertions, 16 deletions
diff --git a/sys/cam/scsi/scsi_low.c b/sys/cam/scsi/scsi_low.c index 1d0a01d0c1d0..ef37b6c69ed0 100644 --- a/sys/cam/scsi/scsi_low.c +++ b/sys/cam/scsi/scsi_low.c @@ -56,7 +56,9 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> +#ifdef __NetBSD__ #include <sys/disklabel.h> +#endif #if defined(__FreeBSD__) && __FreeBSD_version >= 500001 #include <sys/bio.h> #endif @@ -66,15 +68,13 @@ #include <sys/device_port.h> #include <sys/errno.h> +#ifdef __NetBSD__ #include <vm/vm.h> #include <machine/bus.h> -#ifdef __NetBSD__ #include <machine/intr.h> -#endif #include <machine/dvcfg.h> -#ifdef __NetBSD__ #include <dev/cons.h> #include <dev/scsipi/scsipi_all.h> @@ -89,12 +89,10 @@ #include <cam/cam.h> #include <cam/cam_ccb.h> #include <cam/cam_sim.h> -#include <cam/cam_xpt_sim.h> #include <cam/cam_debug.h> #include <cam/cam_periph.h> #include <cam/scsi/scsi_all.h> -#include <cam/scsi/scsi_message.h> #include <cam/scsi/scsi_low.h> @@ -103,7 +101,6 @@ #else #include <sys/cons.h> #endif -#include <machine/clock.h> #define delay(time) DELAY(time) /* from sys/dev/usb/usb_port.h diff --git a/sys/cam/scsi/scsi_low_pisa.c b/sys/cam/scsi/scsi_low_pisa.c index b095a80c3918..3918ffc1e8ab 100644 --- a/sys/cam/scsi/scsi_low_pisa.c +++ b/sys/cam/scsi/scsi_low_pisa.c @@ -36,20 +36,18 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> +#ifdef __NetBSD__ #include <sys/disklabel.h> +#endif #if defined(__FreeBSD__) && __FreeBSD_version >= 500001 #include <sys/bio.h> #endif #include <sys/buf.h> #include <sys/queue.h> -#include <sys/malloc.h> #include <sys/device_port.h> -#include <sys/errno.h> -#include <vm/vm.h> - -#include <machine/bus.h> #ifdef __NetBSD__ +#include <machine/bus.h> #include <machine/intr.h> #endif @@ -58,11 +56,9 @@ #include <dev/isa/isavar.h> #include <dev/isa/pisaif.h> -#endif #include <machine/dvcfg.h> -#ifdef __NetBSD__ #include <dev/scsipi/scsi_all.h> #include <dev/scsipi/scsipi_all.h> #include <dev/scsipi/scsiconf.h> @@ -74,9 +70,6 @@ #define SCSIBUS_RESCAN #else #ifdef __FreeBSD__ -#include <i386/isa/isa_device.h> -#include <i386/isa/icu.h> - #include <cam/scsi/scsi_low.h> #include <cam/scsi/scsi_low_pisa.h> #endif |