From 5f2befc69afb945e4cfd4be27ee1ebcaa57e32c6 Mon Sep 17 00:00:00 2001
From: imp <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/stg/tmc18c30_pccard.c | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

(limited to 'sys/dev/stg')

diff --git a/sys/dev/stg/tmc18c30_pccard.c b/sys/dev/stg/tmc18c30_pccard.c
index 984f33a..0ea2df0 100644
--- a/sys/dev/stg/tmc18c30_pccard.c
+++ b/sys/dev/stg/tmc18c30_pccard.c
@@ -42,9 +42,11 @@
 __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/module.h>
+#include <sys/systm.h>
 
 #include <machine/bus.h>
 #include <machine/bus_pio.h>
@@ -52,7 +54,6 @@ __FBSDID("$FreeBSD$");
 
 #include <sys/device_port.h>
 
-#include "pccarddevs.h"
 #include <dev/pccard/pccardvar.h>
 
 #include <cam/scsi/scsi_low.h>
@@ -62,13 +63,7 @@ __FBSDID("$FreeBSD$");
 #include <dev/stg/tmc18c30var.h>
 #include <dev/stg/tmc18c30.h>
 
-#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 const struct pccard_product stg_products[] = {
 	PCMCIA_CARD(FUTUREDOMAIN, SCSI2GO, 0),
-- 
cgit v1.1