diff options
| author | mjacob <mjacob@FreeBSD.org> | 2000-02-29 05:48:46 +0000 |
|---|---|---|
| committer | mjacob <mjacob@FreeBSD.org> | 2000-02-29 05:48:46 +0000 |
| commit | 39f4ff01fa06d96d64bc43680ea9fb659d3aa467 (patch) | |
| tree | 3e781cc06a7d6c8ceaa888cc867ac4486125edce /sys/pci | |
| parent | fb49122cc2cf5b40d683c7748f69cb155116be74 (diff) | |
| download | FreeBSD-src-39f4ff01fa06d96d64bc43680ea9fb659d3aa467.zip FreeBSD-src-39f4ff01fa06d96d64bc43680ea9fb659d3aa467.tar.gz | |
Clean up defines for correct 12160/1080 exclusion. Final 4.0.
approved: JKH
Diffstat (limited to 'sys/pci')
| -rw-r--r-- | sys/pci/isp_pci.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/pci/isp_pci.c b/sys/pci/isp_pci.c index 9ced6f8..b2f72d4 100644 --- a/sys/pci/isp_pci.c +++ b/sys/pci/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; |
