28c28
< __FBSDID("$FreeBSD: head/sys/dev/aic/aic_pccard.c 170872 2007-06-17 05:55:54Z scottl $");
---
> __FBSDID("$FreeBSD: head/sys/dev/aic/aic_pccard.c 241591 2012-10-15 16:09:59Z jhb $");
30a31
> #include <sys/callout.h>
31a33
> #include <sys/lock.h>
32a35
> #include <sys/mutex.h>
74c77
< sc->sc_port = sc->sc_irq = 0;
---
> sc->sc_port = sc->sc_irq = NULL;
90,92c93,94
< sc->sc_aic.unit = device_get_unit(dev);
< sc->sc_aic.tag = rman_get_bustag(sc->sc_port);
< sc->sc_aic.bsh = rman_get_bushandle(sc->sc_port);
---
> sc->sc_aic.res = sc->sc_port;
> mtx_init(&sc->sc_aic.lock, "aic", NULL, MTX_DEF);
105c107,108
< sc->sc_port = sc->sc_irq = 0;
---
> sc->sc_port = sc->sc_irq = NULL;
> mtx_destroy(&sc->sc_aic.lock);
117c120,123
< return 0;
---
> else
> device_set_desc(dev,
> "Adaptec 6260/6360 SCSI controller");
> return (BUS_PROBE_DEFAULT);
119c125
< return EIO;
---
> return (ENXIO);
136,137d141
< device_set_desc(dev, "Adaptec 6260/6360 SCSI controller");
<
145,146c149,150
< error = bus_setup_intr(dev, sc->sc_irq, INTR_TYPE_CAM|INTR_ENTROPY,
< NULL, aic_intr, aic, &sc->sc_ih);
---
> error = bus_setup_intr(dev, sc->sc_irq, INTR_TYPE_CAM | INTR_ENTROPY |
> INTR_MPSAFE, NULL, aic_intr, aic, &sc->sc_ih);