From 8070de6398fcb18977ef8ad638ecbad0936e3fe1 Mon Sep 17 00:00:00 2001 From: Matt Jacob Date: Fri, 1 Sep 2006 05:03:42 +0000 Subject: [PATCH] More ispfwfunc definitions funnies which break pre-7.0 builds. --- sys/dev/isp/isp_freebsd.h | 4 ++++ sys/dev/isp/isp_pci.c | 1 - sys/dev/isp/isp_sbus.c | 1 - 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/dev/isp/isp_freebsd.h b/sys/dev/isp/isp_freebsd.h index 02c0e967f8c..6502dea0084 100644 --- a/sys/dev/isp/isp_freebsd.h +++ b/sys/dev/isp/isp_freebsd.h @@ -97,6 +97,10 @@ #endif #endif +#if __FreeBSD_version < 700000 +typedef void ispfwfunc(int, int, int, uint16_t **); +#endif + #ifdef ISP_TARGET_MODE #define ISP_TARGET_FUNCTIONS 1 #define ATPDPSIZE 256 diff --git a/sys/dev/isp/isp_pci.c b/sys/dev/isp/isp_pci.c index 2132b4ee50f..7ea7dbf5bc7 100644 --- a/sys/dev/isp/isp_pci.c +++ b/sys/dev/isp/isp_pci.c @@ -337,7 +337,6 @@ DRIVER_MODULE(isp, pci, isp_pci_driver, isp_devclass, 0, 0); MODULE_DEPEND(isp, ispfw, 1, 1, 1); MODULE_DEPEND(isp, firmware, 1, 1, 1); #else -typedef void ispfwfunc(int, int, int, uint16_t **); extern ispfwfunc *isp_get_firmware_p; #endif diff --git a/sys/dev/isp/isp_sbus.c b/sys/dev/isp/isp_sbus.c index 32e83a5cdbc..c8b88fc61b0 100644 --- a/sys/dev/isp/isp_sbus.c +++ b/sys/dev/isp/isp_sbus.c @@ -114,7 +114,6 @@ DRIVER_MODULE(isp, sbus, isp_sbus_driver, isp_devclass, 0, 0); #if __FreeBSD_version >= 700000 MODULE_DEPEND(isp, firmware, 1, 1, 1); #else -typedef void ispfwfunc(int, int, int, uint16_t **); extern ispfwfunc *isp_get_firmware_p; #endif