diff --git a/sys/arch/alpha/pci/pci_2100_a50.c b/sys/arch/alpha/pci/pci_2100_a50.c
index 0c6d43f23e96..4e1b094eb799 100644
--- a/sys/arch/alpha/pci/pci_2100_a50.c
+++ b/sys/arch/alpha/pci/pci_2100_a50.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_2100_a50.c,v 1.23 1998/04/24 01:25:18 mjacob Exp $ */
+/* $NetBSD: pci_2100_a50.c,v 1.24 1998/04/25 00:12:44 thorpej Exp $ */
 
 /*
  * Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -29,7 +29,7 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: pci_2100_a50.c,v 1.23 1998/04/24 01:25:18 mjacob Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_2100_a50.c,v 1.24 1998/04/25 00:12:44 thorpej Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -114,15 +114,15 @@ dec_2100_a50_intr_map(acv, bustag, buspin, line, ihp)
 	pirq = 0;				/* XXX gcc -Wuninitialized */
 #endif
 
-        if (buspin == 0) {
-                /* No IRQ used. */
-                return 1;
-        }
-        if (buspin > 4) {
-                printf("dec_2100_a50_intr_map: bad interrupt pin %d\n",
+	if (buspin == 0) {
+		/* No IRQ used. */
+		return 1;
+	}
+	if (buspin > 4) {
+		printf("dec_2100_a50_intr_map: bad interrupt pin %d\n",
 		    buspin);
-                return 1;
-        }
+		return 1;
+	}
 
 	alpha_pci_decompose_tag(pc, bustag, NULL, &device, NULL);
 
diff --git a/sys/arch/alpha/pci/pci_axppci_33.c b/sys/arch/alpha/pci/pci_axppci_33.c
index 1bfc8ef24678..47c5363e4a7b 100644
--- a/sys/arch/alpha/pci/pci_axppci_33.c
+++ b/sys/arch/alpha/pci/pci_axppci_33.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_axppci_33.c,v 1.20 1998/04/24 01:25:19 mjacob Exp $ */
+/* $NetBSD: pci_axppci_33.c,v 1.21 1998/04/25 00:12:44 thorpej Exp $ */
 
 /*
  * Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -29,7 +29,7 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: pci_axppci_33.c,v 1.20 1998/04/24 01:25:19 mjacob Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_axppci_33.c,v 1.21 1998/04/25 00:12:44 thorpej Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -115,15 +115,15 @@ dec_axppci_33_intr_map(lcv, bustag, buspin, line, ihp)
 	pirq = 0;				/* XXX gcc -Wuninitialized */
 #endif
 
-        if (buspin == 0) {
-                /* No IRQ used. */
-                return 1;
-        }
-        if (buspin > 4) {
-                printf("dec_axppci_33_intr_map: bad interrupt pin %d\n",
-                    buspin);
-                return 1;
-        }
+	if (buspin == 0) {
+		/* No IRQ used. */
+		return 1;
+	}
+	if (buspin > 4) {
+		printf("dec_axppci_33_intr_map: bad interrupt pin %d\n",
+		    buspin);
+		return 1;
+	}
 
 	alpha_pci_decompose_tag(pc, bustag, NULL, &device, NULL);
 
diff --git a/sys/arch/alpha/pci/pci_eb164.c b/sys/arch/alpha/pci/pci_eb164.c
index fd33fc162de2..cad247f924bb 100644
--- a/sys/arch/alpha/pci/pci_eb164.c
+++ b/sys/arch/alpha/pci/pci_eb164.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_eb164.c,v 1.14 1998/04/18 01:18:37 thorpej Exp $ */
+/* $NetBSD: pci_eb164.c,v 1.15 1998/04/25 00:12:44 thorpej Exp $ */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: pci_eb164.c,v 1.14 1998/04/18 01:18:37 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_eb164.c,v 1.15 1998/04/25 00:12:44 thorpej Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -179,14 +179,14 @@ dec_eb164_intr_map(ccv, bustag, buspin, line, ihp)
 	pinbase = pinoff = 0;			/* XXX gcc -Wuninitialized */
 #endif
 
-        if (buspin == 0) {
-                /* No IRQ used. */
-                return 1;
-        }
-        if (buspin > 4) {
-                printf("dec_eb164_intr_map: bad interrupt pin %d\n", buspin);
-                return 1;
-        }
+	if (buspin == 0) {
+		/* No IRQ used. */
+		return 1;
+	}
+	if (buspin > 4) {
+		printf("dec_eb164_intr_map: bad interrupt pin %d\n", buspin);
+		return 1;
+	}
 
 	alpha_pci_decompose_tag(pc, bustag, NULL, &device, NULL);
 	switch (device) {
diff --git a/sys/arch/alpha/pci/pci_kn20aa.c b/sys/arch/alpha/pci/pci_kn20aa.c
index 43326f5bddb1..0b9a892b3360 100644
--- a/sys/arch/alpha/pci/pci_kn20aa.c
+++ b/sys/arch/alpha/pci/pci_kn20aa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_kn20aa.c,v 1.30 1998/04/24 01:25:19 mjacob Exp $ */
+/* $NetBSD: pci_kn20aa.c,v 1.31 1998/04/25 00:12:45 thorpej Exp $ */
 
 /*
  * Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -29,7 +29,7 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: pci_kn20aa.c,v 1.30 1998/04/24 01:25:19 mjacob Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_kn20aa.c,v 1.31 1998/04/25 00:12:45 thorpej Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -123,14 +123,14 @@ dec_kn20aa_intr_map(ccv, bustag, buspin, line, ihp)
 	int device;
 	int kn20aa_irq;
 
-        if (buspin == 0) {
-                /* No IRQ used. */
-                return 1;
-        }
-        if (buspin > 4) {
-                printf("dec_kn20aa_intr_map: bad interrupt pin %d\n", buspin);
-                return 1;
-        }
+	if (buspin == 0) {
+		/* No IRQ used. */
+		return 1;
+	}
+	if (buspin > 4) {
+		printf("dec_kn20aa_intr_map: bad interrupt pin %d\n", buspin);
+		return 1;
+	}
 
 	/*
 	 * Slot->interrupt translation.  Appears to work, though it
diff --git a/sys/arch/alpha/pci/pci_kn300.c b/sys/arch/alpha/pci/pci_kn300.c
index 5b23a4f52309..9e70a55d80f1 100644
--- a/sys/arch/alpha/pci/pci_kn300.c
+++ b/sys/arch/alpha/pci/pci_kn300.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_kn300.c,v 1.4 1998/04/24 01:25:19 mjacob Exp $ */
+/* $NetBSD: pci_kn300.c,v 1.5 1998/04/25 00:12:45 thorpej Exp $ */
 
 /*
  * Copyright (c) 1998 by Matthew Jacob
@@ -32,7 +32,7 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: pci_kn300.c,v 1.4 1998/04/24 01:25:19 mjacob Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_kn300.c,v 1.5 1998/04/25 00:12:45 thorpej Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -160,14 +160,14 @@ dec_kn300_intr_map(ccv, bustag, buspin, line, ihp)
 	int device;
 	int kn300_irq;
 
-        if (buspin == 0) {
-                /* No IRQ used. */
-                return 1;
-        }
-        if (buspin > 4 || buspin < 0) {
-                printf("dec_kn300_intr_map: bad interrupt pin %d\n", buspin);
-                return 1;
-        }
+	if (buspin == 0) {
+		/* No IRQ used. */
+		return 1;
+	}
+	if (buspin > 4 || buspin < 0) {
+		printf("dec_kn300_intr_map: bad interrupt pin %d\n", buspin);
+		return 1;
+	}
 
 	alpha_pci_decompose_tag(pc, bustag, NULL, &device, NULL);
 
diff --git a/sys/arch/alpha/pci/pci_kn8ae.c b/sys/arch/alpha/pci/pci_kn8ae.c
index 91d8a68f749e..8438c5b4eea3 100644
--- a/sys/arch/alpha/pci/pci_kn8ae.c
+++ b/sys/arch/alpha/pci/pci_kn8ae.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_kn8ae.c,v 1.12 1998/04/24 01:25:19 mjacob Exp $ */
+/* $NetBSD: pci_kn8ae.c,v 1.13 1998/04/25 00:12:45 thorpej Exp $ */
 
 /*
  * Copyright (c) 1997 by Matthew Jacob
@@ -32,7 +32,7 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: pci_kn8ae.c,v 1.12 1998/04/24 01:25:19 mjacob Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_kn8ae.c,v 1.13 1998/04/25 00:12:45 thorpej Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -132,14 +132,14 @@ dec_kn8ae_intr_map(ccv, bustag, buspin, line, ihp)
 	struct dwlpx_config *ccp = ccv;
 	pci_chipset_tag_t pc = &ccp->cc_pc;
 
-        if (buspin == 0) {
-                /* No IRQ used. */
-                return 1;
-        }
-        if (buspin > 4) {
-                printf("dec_kn8ae_intr_map: bad interrupt pin %d\n", buspin);
-                return 1;
-        }
+	if (buspin == 0) {
+		/* No IRQ used. */
+		return 1;
+	}
+	if (buspin > 4) {
+		printf("dec_kn8ae_intr_map: bad interrupt pin %d\n", buspin);
+		return 1;
+	}
 	alpha_pci_decompose_tag(pc, bustag, NULL, &device, NULL);
 	ionode = ccp->cc_sc->dwlpx_node - 4;
 	hose = ccp->cc_sc->dwlpx_hosenum;