3 files changed, 7 insertions, 5 deletions

diff --git a/sys/dev/pccbb/pccbb.c b/sys/dev/pccbb/pccbb.c
index fd1167886c29..d412e3af771e 100644
--- a/sys/dev/pccbb/pccbb.c
+++ b/sys/dev/pccbb/pccbb.c
@@ -358,7 +358,8 @@ cbb_detach(device_t brdev)
 
 int
 cbb_setup_intr(device_t dev, device_t child, struct resource *irq,
-  int flags, driver_intr_t *intr, void *arg, void **cookiep)
+  int flags, driver_filter_t *filt, driver_intr_t *intr, void *arg,
+   void **cookiep)
 {
 	struct cbb_intrhand *ih;
 	struct cbb_softc *sc = device_get_softc(dev);
@@ -370,7 +371,7 @@ cbb_setup_intr(device_t dev, device_t child, struct resource *irq,
 	 * least common denominator until the base system supports mixing
 	 * and matching better.
 	 */
-	if ((flags & INTR_FAST) != 0)
+	if (filt != NULL)
 		return (EINVAL);
 	ih = malloc(sizeof(struct cbb_intrhand), M_DEVBUF, M_NOWAIT);
 	if (ih == NULL)
@@ -384,7 +385,7 @@ cbb_setup_intr(device_t dev, device_t child, struct resource *irq,
 	 * XXX for now that's all we need to do.
 	 */
 	err = BUS_SETUP_INTR(device_get_parent(dev), child, irq, flags,
-	    cbb_func_intr, ih, &ih->cookie);
+	    NULL, cbb_func_intr, ih, &ih->cookie);
 	if (err != 0) {
 		free(ih, M_DEVBUF);
 		return (err);
diff --git a/sys/dev/pccbb/pccbb_pci.c b/sys/dev/pccbb/pccbb_pci.c
index ec7276772efd..65b28f7b6766 100644
--- a/sys/dev/pccbb/pccbb_pci.c
+++ b/sys/dev/pccbb/pccbb_pci.c
@@ -400,7 +400,7 @@ cbb_pci_attach(device_t brdev)
 	}
 
 	if (bus_setup_intr(brdev, sc->irq_res, INTR_TYPE_AV | INTR_MPSAFE,
-	    cbb_pci_intr, sc, &sc->intrhand)) {
+	    NULL, cbb_pci_intr, sc, &sc->intrhand)) {
 		device_printf(brdev, "couldn't establish interrupt\n");
 		goto err;
 	}
diff --git a/sys/dev/pccbb/pccbbvar.h b/sys/dev/pccbb/pccbbvar.h
index 32bd0fe78c68..15ea0a0e26f6 100644
--- a/sys/dev/pccbb/pccbbvar.h
+++ b/sys/dev/pccbb/pccbbvar.h
@@ -136,7 +136,8 @@ int	cbb_release_resource(device_t brdev, device_t child,
 	    int type, int rid, struct resource *r);
 int	cbb_resume(device_t self);
 int	cbb_setup_intr(device_t dev, device_t child, struct resource *irq,
-	    int flags, driver_intr_t *intr, void *arg, void **cookiep);
+	    int flags, driver_filter_t *filt, driver_intr_t *intr, void *arg,
+	    void **cookiep);
 int	cbb_suspend(device_t self);
 int	cbb_teardown_intr(device_t dev, device_t child, struct resource *irq,
 	    void *cookie);