diff --git a/sys/dev/cardbus/cardslotvar.h b/sys/dev/cardbus/cardslotvar.h
index 970ef8f618f3..3d3efb058fe5 100644
--- a/sys/dev/cardbus/cardslotvar.h
+++ b/sys/dev/cardbus/cardslotvar.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: cardslotvar.h,v 1.5 2000/03/13 23:52:38 soren Exp $	*/
+/*	$NetBSD: cardslotvar.h,v 1.6 2001/05/30 09:21:47 haya Exp $	*/
 
 /*
  * Copyright (c) 1999
@@ -45,18 +45,21 @@ struct cardslot_event;
  * PCMCIA (including CardBus and 16-bit card) slot.
  */
 struct cardslot_attach_args {
-  char *caa_busname;
+	char *caa_busname;
 
-  int caa_slot;
+	int caa_slot;
 
-  /* for cardbus... */
-  struct cbslot_attach_args *caa_cb_attach;
+	/* for cardbus... */
+	struct cbslot_attach_args *caa_cb_attach;
 
-  /* for 16-bit pcmcia */
-  struct pcmciabus_attach_args *caa_16_attach;
+	/* for 16-bit pcmcia */
+	struct pcmciabus_attach_args *caa_16_attach;
 
-  /* XXX: for 16-bit pcmcia.  dirty!  This should be removed to achieve MI. */
-  struct pcic_handle *caa_ph;
+	/*
+	 * XXX: for 16-bit pcmcia.  dirty!  This should be removed to
+         * achieve MI.
+	 */
+	struct pcic_handle *caa_ph;
 };
 
 
@@ -65,20 +68,20 @@ struct cardslot_attach_args {
  * PCMCIA (including CardBus and 16-bit card) slot.
  */
 struct cardslot_softc {
-  struct device sc_dev;
+	struct device sc_dev;
 
-  int sc_slot;			/* slot number */
-  int sc_status;		/* the status of slot */
+	int sc_slot;		/* slot number */
+	int sc_status;		/* the status of slot */
 
-  struct cardbus_softc *sc_cb_softc;
-  struct pcmcia_softc *sc_16_softc;
+	struct cardbus_softc *sc_cb_softc;
+	struct pcmcia_softc *sc_16_softc;
 
-  struct proc *sc_event_thread;
-  int sc_th_enable;		/* true if the thread is enabled */
+	struct proc *sc_event_thread;
+	int sc_th_enable;	/* true if the thread is enabled */
 
-  /* An event queue for the thread which processes slot state events. */
+	/* An event queue for the thread which processes slot state events. */
 
-  SIMPLEQ_HEAD(, cardslot_event) sc_events;
+	SIMPLEQ_HEAD(, cardslot_event) sc_events;
 };
 
 #define CARDSLOT_STATUS_CARD_MASK     0x07
@@ -103,9 +106,9 @@ struct cardslot_softc {
 
 
 struct cardslot_event {
-  SIMPLEQ_ENTRY(cardslot_event) ce_q;
+	SIMPLEQ_ENTRY(cardslot_event) ce_q;
 
-  int ce_type;
+	int ce_type;
 };
 
 typedef struct cardslot_softc *cardslot_t;