Move the declaration of the interrupt type from the driver structure

to the BUS_SETUP_INTR call.

1 files changed, 8 insertions, 7 deletions

diff --git a/sys/kern/subr_bus.c b/sys/kern/subr_bus.c
index 7e79e3d..c9281f5 100644
--- a/sys/kern/subr_bus.c
+++ b/sys/kern/subr_bus.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: subr_bus.c,v 1.18 1999/04/19 19:39:08 peter Exp $
+ *	$Id: subr_bus.c,v 1.19 1999/05/08 18:08:59 peter Exp $
  */
 
 #include <sys/param.h>
@@ -1655,12 +1655,13 @@ bus_generic_driver_added(device_t dev, driver_t *driver)
 
 int
 bus_generic_setup_intr(device_t dev, device_t child, struct resource *irq, 
-		       driver_intr_t *intr, void *arg, void **cookiep)
+		       int flags, driver_intr_t *intr, void *arg,
+		       void **cookiep)
 {
 	/* Propagate up the bus hierarchy until someone handles it. */
 	if (dev->parent)
-		return (BUS_SETUP_INTR(dev->parent, child, irq, intr, arg, 
-				       cookiep));
+		return (BUS_SETUP_INTR(dev->parent, child, irq, flags,
+				       intr, arg, cookiep));
 	else
 		return (EINVAL);
 }
@@ -1767,12 +1768,13 @@ bus_release_resource(device_t dev, int type, int rid, struct resource *r)
 }
 
 int
-bus_setup_intr(device_t dev, struct resource *r,
+bus_setup_intr(device_t dev, struct resource *r, int flags,
 	       driver_intr_t handler, void *arg, void **cookiep)
 {
 	if (dev->parent == 0)
 		return (EINVAL);
-	return (BUS_SETUP_INTR(dev->parent, dev, r, handler, arg, cookiep));
+	return (BUS_SETUP_INTR(dev->parent, dev, r, flags,
+			       handler, arg, cookiep));
 }
 
 int
@@ -1816,7 +1818,6 @@ static device_method_t root_methods[] = {
 static driver_t root_driver = {
 	"root",
 	root_methods,
-	DRIVER_TYPE_MISC,
 	1,			/* no softc */
 };