diff --git a/sys/dev/isp/isp_pci.c b/sys/dev/isp/isp_pci.c
index 5bab47825241..69dbd833d1a0 100644
--- a/sys/dev/isp/isp_pci.c
+++ b/sys/dev/isp/isp_pci.c
@@ -1,4 +1,4 @@
-/* $Id: isp_pci.c,v 1.26 1999/07/05 22:01:48 mjacob Exp $ */
+/* $Id: isp_pci.c,v 1.27 1999/07/05 22:04:08 mjacob Exp $ */
 /* release_6_5_99 */
 /*
  * PCI specific probe and attach routines for Qlogic ISP SCSI adapters.
@@ -322,6 +322,16 @@ isp_pci_attach(pcici_t cfid, int unit)
 	}
 	bzero(pcs, sizeof (struct isp_pcisoftc));
 
+	/*
+	 * Figure out if we're supposed to skip this one.
+	 */
+	if (getenv_int("isp_disable", &bitmap)) {
+		if (bitmap & (1 << unit)) {
+			printf("isp%d: not configuring\n", unit);
+			return;
+		}
+	}
+
 	/*
 	 * Figure out which we should try first - memory mapping or i/o mapping?
 	 */
diff --git a/sys/pci/isp_pci.c b/sys/pci/isp_pci.c
index 5bab47825241..69dbd833d1a0 100644
--- a/sys/pci/isp_pci.c
+++ b/sys/pci/isp_pci.c
@@ -1,4 +1,4 @@
-/* $Id: isp_pci.c,v 1.26 1999/07/05 22:01:48 mjacob Exp $ */
+/* $Id: isp_pci.c,v 1.27 1999/07/05 22:04:08 mjacob Exp $ */
 /* release_6_5_99 */
 /*
  * PCI specific probe and attach routines for Qlogic ISP SCSI adapters.
@@ -322,6 +322,16 @@ isp_pci_attach(pcici_t cfid, int unit)
 	}
 	bzero(pcs, sizeof (struct isp_pcisoftc));
 
+	/*
+	 * Figure out if we're supposed to skip this one.
+	 */
+	if (getenv_int("isp_disable", &bitmap)) {
+		if (bitmap & (1 << unit)) {
+			printf("isp%d: not configuring\n", unit);
+			return;
+		}
+	}
+
 	/*
 	 * Figure out which we should try first - memory mapping or i/o mapping?
 	 */