diff options
| author | imp <imp@FreeBSD.org> | 2004-05-27 03:49:45 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2004-05-27 03:49:45 +0000 |
| commit | 5f2befc69afb945e4cfd4be27ee1ebcaa57e32c6 (patch) | |
| tree | 03c5a44a01738f0202b18c0c101b670a5d3fb47c /sys/dev/nsp | |
| parent | ab185f085d5b6e04f5f08fa62e0571a18f1870cc (diff) | |
| download | FreeBSD-src-5f2befc69afb945e4cfd4be27ee1ebcaa57e32c6.zip FreeBSD-src-5f2befc69afb945e4cfd4be27ee1ebcaa57e32c6.tar.gz | |
Fix disordering of pccarddevs.h noticed by bde. Also remove a few
redundant includes and fix some of the include disordering.
Submitted by: bde
Diffstat (limited to 'sys/dev/nsp')
| -rw-r--r-- | sys/dev/nsp/nsp_pccard.c | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/sys/dev/nsp/nsp_pccard.c b/sys/dev/nsp/nsp_pccard.c index 38af6f4..4c61b07 100644 --- a/sys/dev/nsp/nsp_pccard.c +++ b/sys/dev/nsp/nsp_pccard.c @@ -38,18 +38,19 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> -#include <sys/systm.h> -#include <sys/malloc.h> +#include <sys/bus.h> #include <sys/errno.h> - -#include <vm/vm.h> +#include <sys/kernel.h> +#include <sys/malloc.h> +#include <sys/systm.h> #include <machine/bus.h> +#include <machine/resource.h> +#include <sys/rman.h> #include <compat/netbsd/dvcfg.h> #include <sys/device_port.h> -#include "pccarddevs.h" #include <dev/pccard/pccardvar.h> #include <cam/scsi/scsi_low.h> @@ -60,13 +61,7 @@ __FBSDID("$FreeBSD$"); #define NSP_HOSTID 7 -#include <sys/kernel.h> -#include <sys/module.h> -#if !defined(__FreeBSD__) || __FreeBSD_version < 500014 -#include <sys/select.h> -#endif -#include <pccard/cardinfo.h> -#include <pccard/slot.h> +#include "pccarddevs.h" #define PIO_MODE 0x100 /* pd_flags */ |
