summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormjacob <mjacob@FreeBSD.org>1999-06-24 16:42:33 +0000
committermjacob <mjacob@FreeBSD.org>1999-06-24 16:42:33 +0000
commitbe4c63bf19ff7703c3b4299b841dc5bbc8409386 (patch)
tree47c81378eed99782720023e58aa2248a83470072
parent1d3007c47da2a868f385633fd178582853be2997 (diff)
downloadFreeBSD-src-be4c63bf19ff7703c3b4299b841dc5bbc8409386.zip
FreeBSD-src-be4c63bf19ff7703c3b4299b841dc5bbc8409386.tar.gz
(corrections for type change in softc)
-rw-r--r--sys/dev/isp/isp_pci.c6
-rw-r--r--sys/pci/isp_pci.c6
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/dev/isp/isp_pci.c b/sys/dev/isp/isp_pci.c
index 310837c..c61ca12 100644
--- a/sys/dev/isp/isp_pci.c
+++ b/sys/dev/isp/isp_pci.c
@@ -1,5 +1,5 @@
-/* $Id: isp_pci.c,v 1.21 1999/05/09 17:07:07 peter Exp $ */
-/* release_5_11_99 */
+/* $Id: isp_pci.c,v 1.22 1999/05/11 04:53:57 mjacob Exp $ */
+/* release_5_11_99+ */
/*
* PCI specific probe and attach routines for Qlogic ISP SCSI adapters.
* FreeBSD Version.
@@ -1054,7 +1054,7 @@ isp_pci_mbxdma(struct ispsoftc *isp)
if (isp->isp_type & ISP_HA_FC) {
fcparam *fcp = isp->isp_param;
len = ISP2100_SCRLEN;
- fcp->isp_scratch = (volatile caddr_t)
+ fcp->isp_scratch = (caddr_t)
malloc(ISP2100_SCRLEN, M_DEVBUF, M_NOWAIT);
if (fcp->isp_scratch == NULL) {
printf("%s: cannot alloc scratch\n", isp->isp_name);
diff --git a/sys/pci/isp_pci.c b/sys/pci/isp_pci.c
index 310837c..c61ca12 100644
--- a/sys/pci/isp_pci.c
+++ b/sys/pci/isp_pci.c
@@ -1,5 +1,5 @@
-/* $Id: isp_pci.c,v 1.21 1999/05/09 17:07:07 peter Exp $ */
-/* release_5_11_99 */
+/* $Id: isp_pci.c,v 1.22 1999/05/11 04:53:57 mjacob Exp $ */
+/* release_5_11_99+ */
/*
* PCI specific probe and attach routines for Qlogic ISP SCSI adapters.
* FreeBSD Version.
@@ -1054,7 +1054,7 @@ isp_pci_mbxdma(struct ispsoftc *isp)
if (isp->isp_type & ISP_HA_FC) {
fcparam *fcp = isp->isp_param;
len = ISP2100_SCRLEN;
- fcp->isp_scratch = (volatile caddr_t)
+ fcp->isp_scratch = (caddr_t)
malloc(ISP2100_SCRLEN, M_DEVBUF, M_NOWAIT);
if (fcp->isp_scratch == NULL) {
printf("%s: cannot alloc scratch\n", isp->isp_name);
OpenPOWER on IntegriCloud