summaryrefslogtreecommitdiff
path: root/sys/dev/isp
diff options
context:
space:
mode:
authorMatt Jacob <mjacob@FreeBSD.org>2000-02-29 05:48:46 +0000
committerMatt Jacob <mjacob@FreeBSD.org>2000-02-29 05:48:46 +0000
commit2e56bc770d3e789a4211ecba0947aeab55a22375 (patch)
tree17709ea2198fe3f51f66c0647af6f198ff374dd3 /sys/dev/isp
parent06f13592e1159eddacf4ed78d8ea929f551c172a (diff)
Notes
Diffstat (limited to 'sys/dev/isp')
-rw-r--r--sys/dev/isp/isp_pci.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/dev/isp/isp_pci.c b/sys/dev/isp/isp_pci.c
index 9ced6f8f7dd9..b2f72d4f519f 100644
--- a/sys/dev/isp/isp_pci.c
+++ b/sys/dev/isp/isp_pci.c
@@ -56,7 +56,7 @@
static u_int16_t isp_pci_rd_reg __P((struct ispsoftc *, int));
static void isp_pci_wr_reg __P((struct ispsoftc *, int, u_int16_t));
-#if !defined(ISP_DISABLE_1080_SUPPORT) && !defined(ISP_DISABLE_12160_SUPPORT)
+#if !defined(ISP_DISABLE_1080_SUPPORT) || !defined(ISP_DISABLE_12160_SUPPORT)
static u_int16_t isp_pci_rd_reg_1080 __P((struct ispsoftc *, int));
static void isp_pci_wr_reg_1080 __P((struct ispsoftc *, int, u_int16_t));
#endif
@@ -489,7 +489,7 @@ isp_pci_attach(device_t dev)
ISP1080_DMA_REGS_OFF;
}
#endif
-#ifndef ISP_DISABLE_1080_SUPPORT
+#ifndef ISP_DISABLE_12160_SUPPORT
if (pci_get_devid(dev) == PCI_QLOGIC_ISP12160) {
mdvp = &mdvec_12160;
basetype = ISP_HA_SCSI_12160;
@@ -778,7 +778,7 @@ isp_pci_wr_reg(isp, regoff, val)
}
}
-#if !defined(ISP_DISABLE_1080_SUPPORT) && !defined(ISP_DISABLE_12160_SUPPORT)
+#if !defined(ISP_DISABLE_1080_SUPPORT) || !defined(ISP_DISABLE_12160_SUPPORT)
static u_int16_t
isp_pci_rd_reg_1080(isp, regoff)
struct ispsoftc *isp;