diff --git a/sys/dev/pci/isp_pci.c b/sys/dev/pci/isp_pci.c
index 90dbd153ce9d..8f9c0366a958 100644
--- a/sys/dev/pci/isp_pci.c
+++ b/sys/dev/pci/isp_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: isp_pci.c,v 1.90 2003/12/04 13:57:31 keihan Exp $ */
+/* $NetBSD: isp_pci.c,v 1.91 2004/03/10 22:42:47 matt Exp $ */
 /*
  * This driver, which is contained in NetBSD in the files:
  *
@@ -57,7 +57,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isp_pci.c,v 1.90 2003/12/04 13:57:31 keihan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isp_pci.c,v 1.91 2004/03/10 22:42:47 matt Exp $");
 
 #include <dev/ic/isp_netbsd.h>
 #include <dev/pci/pcireg.h>
@@ -72,10 +72,18 @@ static void isp_pci_wr_reg(struct ispsoftc *, int, u_int16_t);
 static u_int16_t isp_pci_rd_reg_1080(struct ispsoftc *, int);
 static void isp_pci_wr_reg_1080(struct ispsoftc *, int, u_int16_t);
 #endif
+#if !defined(ISP_DISABLE_2100_SUPPORT) && \
+	 !defined(ISP_DISABLE_2200_SUPPORT) && \
+	 !defined(ISP_DISABLE_1020_SUPPORT) && \
+	 !defined(ISP_DISABLE_1080_SUPPORT) && \
+	 !defined(ISP_DISABLE_12160_SUPPORT) 
 static int
 isp_pci_rd_isr(struct ispsoftc *, u_int16_t *, u_int16_t *, u_int16_t *);
+#endif
+#if !defined(ISP_DISABLE_2300_SUPPORT)
 static int
 isp_pci_rd_isr_2300(struct ispsoftc *, u_int16_t *, u_int16_t *, u_int16_t *);
+#endif
 static int isp_pci_mbxdma(struct ispsoftc *);
 static int isp_pci_dmasetup(struct ispsoftc *, XS_T *, ispreq_t *,
     u_int16_t *, u_int16_t);
@@ -714,6 +722,11 @@ isp_pci_rd_debounced(struct ispsoftc *isp, int off, u_int16_t *rp)
 	return (0);
 }
 
+#if !defined(ISP_DISABLE_2100_SUPPORT) && \
+	 !defined(ISP_DISABLE_2200_SUPPORT) && \
+	 !defined(ISP_DISABLE_1020_SUPPORT) && \
+	 !defined(ISP_DISABLE_1080_SUPPORT) && \
+	 !defined(ISP_DISABLE_12160_SUPPORT) 
 static int
 isp_pci_rd_isr(struct ispsoftc *isp, u_int16_t *isrp,
     u_int16_t *semap, u_int16_t *mbp)
@@ -750,6 +763,7 @@ isp_pci_rd_isr(struct ispsoftc *isp, u_int16_t *isrp,
 	}
 	return (1);
 }
+#endif
 
 #ifndef	ISP_DISABLE_2300_SUPPORT
 static int