Deleted Added
full compact
31c31
< __FBSDID("$FreeBSD: head/sys/dev/isp/isp_sbus.c 157943 2006-04-21 18:30:01Z mjacob $");
---
> __FBSDID("$FreeBSD: head/sys/dev/isp/isp_sbus.c 160212 2006-07-09 17:50:20Z mjacob $");
34a35,38
> #if __FreeBSD_version >= 700000
> #include <sys/linker.h>
> #include <sys/firmware.h>
> #endif
95d98
< extern ispfwfunc *isp_get_firmware_p;
109a113,118
> #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
251a261,271
> #if __FreeBSD_version >= 700000
> isp->isp_osinfo.fw = firmware_get("isp_1000");
> if (isp->isp_osinfo.fw) {
> union {
> const void *cp;
> uint16_t *sp;
> } stupid;
> stupid.cp = isp->isp_osinfo.fw->data;
> isp->isp_mdvec->dv_ispfw = stupid.sp;
> }
> #else
255d274
<
258a278
> #endif