From 2e31e339d14cb2dbcd32c3747ee7589160cd60cf Mon Sep 17 00:00:00 2001
From: Warner Losh <imp@FreeBSD.org>
Date: Thu, 27 May 2004 03:49:45 +0000
Subject: Fix disordering of pccarddevs.h noticed by bde.  Also remove a few
 redundant includes and fix some of the include disordering.

Submitted by: bde
---
 sys/dev/ncv/ncr53c500_pccard.c | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

(limited to 'sys/dev/ncv')

diff --git a/sys/dev/ncv/ncr53c500_pccard.c b/sys/dev/ncv/ncr53c500_pccard.c
index 627f1aab89cce..1e97372aa263a 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);
-- 
cgit v1.3