7 files changed, 18 insertions, 20 deletions

diff --git a/sys/alpha/pci/apecs.c b/sys/alpha/pci/apecs.c
index fb86dc97e315..951689499927 100644
--- a/sys/alpha/pci/apecs.c
+++ b/sys/alpha/pci/apecs.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: apecs.c,v 1.5 1999/01/18 20:15:07 gallatin Exp $
+ *	$Id: apecs.c,v 1.6 1999/04/16 21:21:38 peter Exp $
  */
 /*
  * Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -450,8 +450,9 @@ static struct resource *apecs_alloc_resource(device_t bus, device_t child,
 					     u_int flags);
 static int apecs_release_resource(device_t bus, device_t child,
 				  int type, int rid, struct resource *r);
-static int apecs_setup_intr(device_t dev, device_t child, struct resource *irq,
-			  driver_intr_t *intr, void *arg, void **cookiep);
+static int apecs_setup_intr(device_t dev, device_t child,
+			    struct resource *irq, int flags,
+			    driver_intr_t *intr, void *arg, void **cookiep);
 static int apecs_teardown_intr(device_t dev, device_t child,
 			     struct resource *irq, void *cookie);
 
@@ -474,7 +475,6 @@ static device_method_t apecs_methods[] = {
 static driver_t apecs_driver = {
 	"apecs",
 	apecs_methods,
-	DRIVER_TYPE_MISC,
 	sizeof(struct apecs_softc),
 };
 
@@ -563,7 +563,7 @@ apecs_release_resource(device_t bus, device_t child, int type, int rid,
 
 static int
 apecs_setup_intr(device_t dev, device_t child,
-	       struct resource *irq,
+	       struct resource *irq, int flags,
 	       driver_intr_t *intr, void *arg, void **cookiep)
 {
 	int error;
@@ -573,7 +573,8 @@ apecs_setup_intr(device_t dev, device_t child,
 	 *  controller, so we need to special case it 
 	 */
 	if(hwrpb->rpb_type == ST_DEC_2100_A50)
-		return isa_setup_intr(dev, child, irq, intr, arg, cookiep);
+		return isa_setup_intr(dev, child, irq, flags,
+				      intr, arg, cookiep);
 
 	error = rman_activate_resource(irq);
 	if (error)
diff --git a/sys/alpha/pci/apecs_pci.c b/sys/alpha/pci/apecs_pci.c
index fb0b339e5497..cb05f8d9ecfc 100644
--- a/sys/alpha/pci/apecs_pci.c
+++ b/sys/alpha/pci/apecs_pci.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: apecs_pci.c,v 1.1 1999/04/16 21:21:38 peter Exp $
  */
 
 #include <sys/param.h>
@@ -66,7 +66,6 @@ static device_method_t apecs_pcib_methods[] = {
 static driver_t apecs_pcib_driver = {
 	"pcib",
 	apecs_pcib_methods,
-	DRIVER_TYPE_MISC,
 	1,
 };
 
diff --git a/sys/alpha/pci/cia.c b/sys/alpha/pci/cia.c
index e967493b5117..ca7032a13d27 100644
--- a/sys/alpha/pci/cia.c
+++ b/sys/alpha/pci/cia.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: cia.c,v 1.15 1999/03/28 17:52:17 dfr Exp $
+ *	$Id: cia.c,v 1.16 1999/04/16 21:21:39 peter Exp $
  */
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -644,7 +644,8 @@ cia_write_hae(u_int64_t hae)
 
 static int cia_probe(device_t dev);
 static int cia_attach(device_t dev);
-static int cia_setup_intr(device_t dev, device_t child, struct resource *irq,
+static int cia_setup_intr(device_t dev, device_t child,
+			  struct resource *irq, int flags,
 			  driver_intr_t *intr, void *arg, void **cookiep);
 static int cia_teardown_intr(device_t dev, device_t child,
 			     struct resource *irq, void *cookie);
@@ -669,7 +670,6 @@ static device_method_t cia_methods[] = {
 static driver_t cia_driver = {
 	"cia",
 	cia_methods,
-	DRIVER_TYPE_MISC,
 	sizeof(struct cia_softc),
 };
 
@@ -815,7 +815,7 @@ cia_attach(device_t dev)
 
 static int
 cia_setup_intr(device_t dev, device_t child,
-	       struct resource *irq,
+	       struct resource *irq, int flags,
 	       driver_intr_t *intr, void *arg, void **cookiep)
 {
 	int error;
diff --git a/sys/alpha/pci/cia_pci.c b/sys/alpha/pci/cia_pci.c
index e77c3b41722e..9b0c7d11c74a 100644
--- a/sys/alpha/pci/cia_pci.c
+++ b/sys/alpha/pci/cia_pci.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: cia_pci.c,v 1.1 1999/04/16 21:21:39 peter Exp $
  */
 
 #include <sys/param.h>
@@ -66,7 +66,6 @@ static device_method_t cia_pcib_methods[] = {
 static driver_t cia_pcib_driver = {
 	"pcib",
 	cia_pcib_methods,
-	DRIVER_TYPE_MISC,
 	1,
 };
 
diff --git a/sys/alpha/pci/lca.c b/sys/alpha/pci/lca.c
index b60fb3e7fda4..1c86d94420cd 100644
--- a/sys/alpha/pci/lca.c
+++ b/sys/alpha/pci/lca.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: lca.c,v 1.5 1998/12/04 22:54:42 archie Exp $
+ *	$Id: lca.c,v 1.6 1999/04/16 21:21:39 peter Exp $
  */
 
 #include <sys/param.h>
@@ -360,7 +360,6 @@ static device_method_t lca_methods[] = {
 static driver_t lca_driver = {
 	"lca",
 	lca_methods,
-	DRIVER_TYPE_MISC,
 	sizeof(struct lca_softc),
 };
 
diff --git a/sys/alpha/pci/lca_pci.c b/sys/alpha/pci/lca_pci.c
index 61e35257b784..7e84de424152 100644
--- a/sys/alpha/pci/lca_pci.c
+++ b/sys/alpha/pci/lca_pci.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: lca_pci.c,v 1.1 1999/04/16 21:21:39 peter Exp $
  */
 
 #include <sys/param.h>
@@ -66,7 +66,6 @@ static device_method_t lca_pcib_methods[] = {
 static driver_t lca_pcib_driver = {
 	"pcib",
 	lca_pcib_methods,
-	DRIVER_TYPE_MISC,
 	1,
 };
 
diff --git a/sys/alpha/pci/pcibus.c b/sys/alpha/pci/pcibus.c
index f0c0eb2986b9..1479e128e964 100644
--- a/sys/alpha/pci/pcibus.c
+++ b/sys/alpha/pci/pcibus.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: pcibus.c,v 1.10 1999/04/19 08:55:11 dfr Exp $
+ * $Id: pcibus.c,v 1.11 1999/04/21 07:26:24 peter Exp $
  *
  */
 
@@ -149,7 +149,8 @@ alpha_platform_setup_ide_intr(int chan, driver_intr_t *fn, void *arg)
 		struct resource *res;
 		res = isa_alloc_intr(0, 0, irqs[chan]);
 		if (res)
-			return isa_setup_intr(0, 0, res, fn, arg, &junk);
+			return isa_setup_intr(0, 0, res, INTR_TYPE_BIO,
+					      fn, arg, &junk);
 		else
 			return ENOMEM;
 	}