29c29
< __FBSDID("$FreeBSD: head/sys/cam/ctl/ctl_tpc_local.c 274785 2014-11-21 06:27:37Z mav $");
---
> __FBSDID("$FreeBSD: head/sys/cam/ctl/ctl_tpc_local.c 275942 2014-12-19 20:35:06Z mav $");
66d65
< extern struct ctl_softc *control_softc;
312c311,312
< tpcl_resolve(int init_port, struct scsi_ec_cscd *cscd, uint32_t *ss)
---
> tpcl_resolve(struct ctl_softc *softc, int init_port,
> struct scsi_ec_cscd *cscd, uint32_t *ss)
314d313
< struct ctl_softc *softc = control_softc;