summaryrefslogtreecommitdiffstats
path: root/sys/dev/isp/isp_pci.c
diff options
context:
space:
mode:
authormjacob <mjacob@FreeBSD.org>2007-03-12 04:54:30 +0000
committermjacob <mjacob@FreeBSD.org>2007-03-12 04:54:30 +0000
commitf15b215cc0e1082d6dddf0b28e090bd0a7853247 (patch)
treee40b3cf47237e494e476d6f3b70631f204fb38fa /sys/dev/isp/isp_pci.c
parentf85d4141eaf405aace116263c35cd7497a8abb72 (diff)
downloadFreeBSD-src-f15b215cc0e1082d6dddf0b28e090bd0a7853247.zip
FreeBSD-src-f15b215cc0e1082d6dddf0b28e090bd0a7853247.tar.gz
Fix compilation issues found in RELENG_4 port and merge the
diffs back to -current to keep versions identical.
Diffstat (limited to 'sys/dev/isp/isp_pci.c')
-rw-r--r--sys/dev/isp/isp_pci.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/dev/isp/isp_pci.c b/sys/dev/isp/isp_pci.c
index b4d70b4..e0f4b02 100644
--- a/sys/dev/isp/isp_pci.c
+++ b/sys/dev/isp/isp_pci.c
@@ -435,7 +435,6 @@ isp_pci_probe(device_t dev)
static void
isp_get_generic_options(device_t dev, ispsoftc_t *isp)
{
- uint64_t wwn;
int bitmap, unit;
unit = device_get_unit(dev);
@@ -508,6 +507,9 @@ isp_get_pci_options(device_t dev, int *m1, int *m2)
static void
isp_get_specific_options(device_t dev, ispsoftc_t *isp)
{
+ uint64_t wwn;
+ int bitmap;
+ int unit = device_get_unit(dev);
callout_handle_init(&isp->isp_osinfo.ldt);
callout_handle_init(&isp->isp_osinfo.gdt);
OpenPOWER on IntegriCloud