diff options
| author | cognet <cognet@FreeBSD.org> | 2007-02-25 22:17:54 +0000 |
|---|---|---|
| committer | cognet <cognet@FreeBSD.org> | 2007-02-25 22:17:54 +0000 |
| commit | f4f08cb0377213949f23ed80214d424a57e1739b (patch) | |
| tree | 119c111f74385a0dcbe57439a00b42ee39c3d4fc | |
| parent | 76658c2a7d8b5391062fefe7269aecbc9b5bc06f (diff) | |
| download | FreeBSD-src-f4f08cb0377213949f23ed80214d424a57e1739b.zip FreeBSD-src-f4f08cb0377213949f23ed80214d424a57e1739b.tar.gz | |
Update for the new prototype of bus_setup_intr().
| -rw-r--r-- | sys/arm/xscale/ixp425/avila_ata.c | 6 | ||||
| -rw-r--r-- | sys/arm/xscale/ixp425/ixp425_qmgr.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/arm/xscale/ixp425/avila_ata.c b/sys/arm/xscale/ixp425/avila_ata.c index 9c5f2c2..a6f5251 100644 --- a/sys/arm/xscale/ixp425/avila_ata.c +++ b/sys/arm/xscale/ixp425/avila_ata.c @@ -160,7 +160,7 @@ ata_avila_attach(device_t dev) panic("Unable to allocate irq %u.\n", AVILA_IDE_IRQ); bus_setup_intr(dev, sc->sc_irq, INTR_TYPE_BIO | INTR_MPSAFE | INTR_ENTROPY, - ata_avila_intr, sc, &sc->sc_ih); + NULL, ata_avila_intr, sc, &sc->sc_ih); /* attach channel on this controller */ device_add_child(dev, "ata", devclass_find_free_unit(ata_devclass, 0)); @@ -225,8 +225,8 @@ ata_avila_release_resource(device_t dev, device_t child, int type, int rid, static int ata_avila_setup_intr(device_t dev, device_t child, struct resource *irq, - int flags, driver_intr_t *function, void *argument, - void **cookiep) + int flags, driver_filter_t *filt, + driver_intr_t *function, void *argument, void **cookiep) { struct ata_avila_softc *sc = device_get_softc(dev); int unit = ((struct ata_channel *)device_get_softc(child))->unit; diff --git a/sys/arm/xscale/ixp425/ixp425_qmgr.c b/sys/arm/xscale/ixp425/ixp425_qmgr.c index fcf2da2..655acd9 100644 --- a/sys/arm/xscale/ixp425/ixp425_qmgr.c +++ b/sys/arm/xscale/ixp425/ixp425_qmgr.c @@ -225,7 +225,7 @@ ixpqmgr_attach(device_t dev) panic("Unable to allocate the qmgr irqs.\n"); /* XXX could be a source of entropy */ bus_setup_intr(dev, sc->sc_irq, INTR_TYPE_NET | INTR_MPSAFE, - ixpqmgr_intr, NULL, &sc->sc_ih); + NULL, ixpqmgr_intr, NULL, &sc->sc_ih); /* NB: softc is pre-zero'd */ for (i = 0; i < IX_QMGR_MAX_NUM_QUEUES; i++) { |
