Fix some style nits and remove an unused header.

Submitted by:	bde

sys/dev/ed/if_ed.c

@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_ed.c,v 1.132 1998/02/05 04:08:41 eivind Exp $
+ *	$Id: if_ed.c,v 1.133 1998/02/06 12:13:15 eivind Exp $
  */
 
 /*
@@ -205,7 +205,6 @@ static u_long ds_crc(u_char *ep);
 #if NCARD > 0
 #include <sys/select.h>
 #include <pccard/cardinfo.h>
-#include <pccard/driver.h>
 #include <pccard/slot.h>
 
 /*

sys/dev/ep/if_ep.c

@@ -38,7 +38,7 @@
  */
 
 /*
- *  $Id: if_ep.c,v 1.71 1998/02/04 22:32:19 eivind Exp $
+ *  $Id: if_ep.c,v 1.72 1998/02/06 12:13:16 eivind Exp $
  *
  *  Promiscuous mode added and interrupt logic slightly changed
  *  to reduce the number of adapter failures. Transceiver select
@@ -155,7 +155,6 @@ struct isa_driver epdriver = {
 #if NCARD > 0
 #include <sys/select.h>
 #include <pccard/cardinfo.h>
-#include <pccard/driver.h>
 #include <pccard/slot.h>
 
 /*

sys/dev/fe/if_fe.c

@@ -21,7 +21,7 @@
  */
 
 /*
- * $Id: if_fe.c,v 1.36 1997/12/15 20:30:47 eivind Exp $
+ * $Id: if_fe.c,v 1.37 1998/01/08 23:40:53 eivind Exp $
  *
  * Device driver for Fujitsu MB86960A/MB86965A based Ethernet cards.
  * To be used with FreeBSD 2.x
@@ -129,7 +129,6 @@
 #include <sys/select.h>
 #include <pccard/cardinfo.h>
 #include <pccard/slot.h>
-#include <pccard/driver.h>
 #endif
 
 #include <i386/isa/ic/mb86960.h>

sys/dev/sio/sio.c

@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)com.c	7.5 (Berkeley) 5/16/91
- *	$Id: sio.c,v 1.196 1998/02/13 12:45:56 phk Exp $
+ *	$Id: sio.c,v 1.197 1998/02/14 16:17:17 nate Exp $
  */
 
 #include "opt_comconsole.h"
@@ -92,7 +92,6 @@
 #include "card.h"
 #if NCARD > 0
 #include <pccard/cardinfo.h>
-#include <pccard/driver.h>
 #include <pccard/slot.h>
 #endif
 

sys/i386/isa/aic6360.c

@@ -31,7 +31,7 @@
  */
 
 /*
- * $Id: aic6360.c,v 1.36 1997/11/20 15:48:23 nate Exp $
+ * $Id: aic6360.c,v 1.37 1998/02/09 06:08:23 eivind Exp $
  *
  * Acknowledgements: Many of the algorithms used in this driver are
  * inspired by the work of Julian Elischer (julian@tfs.com) and
@@ -702,12 +702,11 @@ static struct scsi_device aic_dev = {
 #if NCARD > 0
 #include <sys/select.h>
 #include <pccard/cardinfo.h>
-#include <pccard/driver.h>
 #include <pccard/slot.h>
 
-static int aicinit(struct pccard_devinfo *);		/* init device */
-static void aicunload(struct pccard_devinfo *);		/* Disable driver */
-static int aic_card_intr(struct pccard_devinfo *);	/* Interrupt handler */
+static int	aic_card_intr	__P((struct pccard_devinfo *));
+static int	aicinit		__P((struct pccard_devinfo *));
+static void	aicunload	__P((struct pccard_devinfo *));
 
 static struct pccard_device aic_info = {
 	"aic",
@@ -715,7 +714,7 @@ static struct pccard_device aic_info = {
 	aicunload,
 	aic_card_intr,
 	0,			/* Attributes - presently unused */
-	&bio_imask		/* Interrupt mask for device */
+	&bio_imask
 };
 
 DATA_SET(pccarddrv_set, aic_info);

sys/i386/isa/if_ed.c

@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_ed.c,v 1.132 1998/02/05 04:08:41 eivind Exp $
+ *	$Id: if_ed.c,v 1.133 1998/02/06 12:13:15 eivind Exp $
  */
 
 /*
@@ -205,7 +205,6 @@ static u_long ds_crc(u_char *ep);
 #if NCARD > 0
 #include <sys/select.h>
 #include <pccard/cardinfo.h>
-#include <pccard/driver.h>
 #include <pccard/slot.h>
 
 /*

sys/i386/isa/if_ep.c

@@ -38,7 +38,7 @@
  */
 
 /*
- *  $Id: if_ep.c,v 1.71 1998/02/04 22:32:19 eivind Exp $
+ *  $Id: if_ep.c,v 1.72 1998/02/06 12:13:16 eivind Exp $
  *
  *  Promiscuous mode added and interrupt logic slightly changed
  *  to reduce the number of adapter failures. Transceiver select
@@ -155,7 +155,6 @@ struct isa_driver epdriver = {
 #if NCARD > 0
 #include <sys/select.h>
 #include <pccard/cardinfo.h>
-#include <pccard/driver.h>
 #include <pccard/slot.h>
 
 /*

sys/i386/isa/if_fe.c

@@ -21,7 +21,7 @@
  */
 
 /*
- * $Id: if_fe.c,v 1.36 1997/12/15 20:30:47 eivind Exp $
+ * $Id: if_fe.c,v 1.37 1998/01/08 23:40:53 eivind Exp $
  *
  * Device driver for Fujitsu MB86960A/MB86965A based Ethernet cards.
  * To be used with FreeBSD 2.x
@@ -129,7 +129,6 @@
 #include <sys/select.h>
 #include <pccard/cardinfo.h>
 #include <pccard/slot.h>
-#include <pccard/driver.h>
 #endif
 
 #include <i386/isa/ic/mb86960.h>

sys/i386/isa/sio.c

@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)com.c	7.5 (Berkeley) 5/16/91
- *	$Id: sio.c,v 1.196 1998/02/13 12:45:56 phk Exp $
+ *	$Id: sio.c,v 1.197 1998/02/14 16:17:17 nate Exp $
  */
 
 #include "opt_comconsole.h"
@@ -92,7 +92,6 @@
 #include "card.h"
 #if NCARD > 0
 #include <pccard/cardinfo.h>
-#include <pccard/driver.h>
 #include <pccard/slot.h>
 #endif
 

sys/isa/sio.c

@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)com.c	7.5 (Berkeley) 5/16/91
- *	$Id: sio.c,v 1.196 1998/02/13 12:45:56 phk Exp $
+ *	$Id: sio.c,v 1.197 1998/02/14 16:17:17 nate Exp $
  */
 
 #include "opt_comconsole.h"
@@ -92,7 +92,6 @@
 #include "card.h"
 #if NCARD > 0
 #include <pccard/cardinfo.h>
-#include <pccard/driver.h>
 #include <pccard/slot.h>
 #endif