summaryrefslogtreecommitdiffstats
path: root/sys/dev/ncv
diff options
context:
space:
mode:
authorimp <imp@FreeBSD.org>2004-05-27 03:49:45 +0000
committerimp <imp@FreeBSD.org>2004-05-27 03:49:45 +0000
commit5f2befc69afb945e4cfd4be27ee1ebcaa57e32c6 (patch)
tree03c5a44a01738f0202b18c0c101b670a5d3fb47c /sys/dev/ncv
parentab185f085d5b6e04f5f08fa62e0571a18f1870cc (diff)
downloadFreeBSD-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/ncv')
-rw-r--r--sys/dev/ncv/ncr53c500_pccard.c17
1 files changed, 7 insertions, 10 deletions
diff --git a/sys/dev/ncv/ncr53c500_pccard.c b/sys/dev/ncv/ncr53c500_pccard.c
index 627f1aa..1e97372 100644
--- a/sys/dev/ncv/ncr53c500_pccard.c
+++ b/sys/dev/ncv/ncr53c500_pccard.c
@@ -40,17 +40,19 @@
__FBSDID("$FreeBSD$");
#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/malloc.h>
#include <sys/errno.h>
+#include <sys/kernel.h>
+#include <sys/malloc.h>
+#include <sys/systm.h>
#include <machine/bus.h>
#include <machine/bus_pio.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>
@@ -63,13 +65,8 @@ __FBSDID("$FreeBSD$");
#define KME_KXLC004_01 0x100
#define OFFSET_KME_KXLC004_01 0x10
-#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"
static int ncvprobe(DEVPORT_PDEVICE devi);
static int ncvattach(DEVPORT_PDEVICE devi);
OpenPOWER on IntegriCloud