diff options
| author | Søren Schmidt <sos@FreeBSD.org> | 2000-09-20 07:00:24 +0000 |
|---|---|---|
| committer | Søren Schmidt <sos@FreeBSD.org> | 2000-09-20 07:00:24 +0000 |
| commit | c50cf4ac06ba3150111617bd13cad5d2b2e27a75 (patch) | |
| tree | 408b8bafe50db8303e3a6590942fcfb0d5e9e949 /sys/dev/ata | |
| parent | f2419699106e44496da034ff48211324183ed301 (diff) | |
Notes
Diffstat (limited to 'sys/dev/ata')
| -rw-r--r-- | sys/dev/ata/ata-all.c | 2 | ||||
| -rw-r--r-- | sys/dev/ata/ata-disk.c | 3 | ||||
| -rw-r--r-- | sys/dev/ata/ata-dma.c | 3 | ||||
| -rw-r--r-- | sys/dev/ata/atapi-all.c | 4 | ||||
| -rw-r--r-- | sys/dev/ata/atapi-cd.c | 1 | ||||
| -rw-r--r-- | sys/dev/ata/atapi-fd.c | 1 |
6 files changed, 3 insertions, 11 deletions
diff --git a/sys/dev/ata/ata-all.c b/sys/dev/ata/ata-all.c index d82ad669ce057..6f933122f1e18 100644 --- a/sys/dev/ata/ata-all.c +++ b/sys/dev/ata/ata-all.c @@ -49,8 +49,6 @@ #include <sys/devicestat.h> #include <sys/sysctl.h> #include <machine/stdarg.h> -#include <vm/vm.h> -#include <vm/pmap.h> #include <machine/resource.h> #include <machine/bus.h> #include <sys/rman.h> diff --git a/sys/dev/ata/ata-disk.c b/sys/dev/ata/ata-disk.c index 4f12574eb1707..aa97a6df3073a 100644 --- a/sys/dev/ata/ata-disk.c +++ b/sys/dev/ata/ata-disk.c @@ -34,7 +34,6 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> -#include <sys/proc.h> #include <sys/malloc.h> #include <sys/bio.h> #include <sys/bus.h> @@ -44,8 +43,6 @@ #include <sys/cons.h> #include <vm/vm.h> #include <vm/pmap.h> -#include <vm/vm_page.h> -#include <vm/vm_object.h> #include <machine/clock.h> #include <machine/md_var.h> #include <machine/bus.h> diff --git a/sys/dev/ata/ata-dma.c b/sys/dev/ata/ata-dma.c index 763017d159a02..3385b67766094 100644 --- a/sys/dev/ata/ata-dma.c +++ b/sys/dev/ata/ata-dma.c @@ -41,9 +41,8 @@ #if NPCI > 0 #include <pci/pcivar.h> #endif -#include <dev/ata/ata-all.h> -#include <dev/ata/ata-disk.h> #include <machine/bus.h> +#include <dev/ata/ata-all.h> #if NPCI > 0 diff --git a/sys/dev/ata/atapi-all.c b/sys/dev/ata/atapi-all.c index 8b034ff664e07..386a90e611179 100644 --- a/sys/dev/ata/atapi-all.c +++ b/sys/dev/ata/atapi-all.c @@ -376,8 +376,8 @@ atapi_interrupt(struct atapi_request *request) atapi_write(request, length); /* FALLTHROUGH */ - case ATAPI_P_ABORT: - case ATAPI_P_DONE: + case ATAPI_P_ABORT: + case ATAPI_P_DONE: if (atp->controller->status & (ATA_S_ERROR | ATA_S_DWF)) request->result = inb(atp->controller->ioaddr + ATA_ERROR); else diff --git a/sys/dev/ata/atapi-cd.c b/sys/dev/ata/atapi-cd.c index 3efd1f4eefac9..052ab3550efc6 100644 --- a/sys/dev/ata/atapi-cd.c +++ b/sys/dev/ata/atapi-cd.c @@ -42,7 +42,6 @@ #include <sys/dvdio.h> #include <sys/fcntl.h> #include <sys/conf.h> -#include <sys/stat.h> #include <sys/ctype.h> #include <dev/ata/ata-all.h> #include <dev/ata/atapi-all.h> diff --git a/sys/dev/ata/atapi-fd.c b/sys/dev/ata/atapi-fd.c index fe2573b0eee9f..3f985efa5a9b8 100644 --- a/sys/dev/ata/atapi-fd.c +++ b/sys/dev/ata/atapi-fd.c @@ -31,7 +31,6 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> -#include <sys/proc.h> #include <sys/malloc.h> #include <sys/bio.h> #include <sys/bus.h> |
