Move the declaration of the interrupt type from the driver structure

to the BUS_SETUP_INTR call.

4 files changed, 6 insertions, 8 deletions

diff --git a/sys/dev/buslogic/bt.c b/sys/dev/buslogic/bt.c
index 23de96c..afa8856 100644
--- a/sys/dev/buslogic/bt.c
+++ b/sys/dev/buslogic/bt.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: bt.c,v 1.19 1999/05/05 06:45:09 imp Exp $
+ *      $Id: bt.c,v 1.20 1999/05/06 20:16:20 ken Exp $
  */
 
  /*
@@ -868,7 +868,8 @@ bt_attach(device_t dev)
 	/*
 	 * Setup interrupt.
 	 */
-	error = bus_setup_intr(dev, bt->irq, bt_intr, bt, &bt->ih);
+	error = bus_setup_intr(dev, bt->irq, INTR_TYPE_CAM,
+			       bt_intr, bt, &bt->ih);
 	if (error) {
 		device_printf(dev, "bus_setup_intr() failed: %d\n", error);
 		return (error);
diff --git a/sys/dev/buslogic/bt_eisa.c b/sys/dev/buslogic/bt_eisa.c
index 19cdd8c..fc369c8 100644
--- a/sys/dev/buslogic/bt_eisa.c
+++ b/sys/dev/buslogic/bt_eisa.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: bt_eisa.c,v 1.5 1999/04/20 09:53:05 dfr Exp $
+ *	$Id: bt_eisa.c,v 1.6 1999/04/24 06:46:10 peter Exp $
  */
 
 #include "eisa.h"
@@ -333,7 +333,6 @@ static device_method_t bt_eisa_methods[] = {
 static driver_t bt_eisa_driver = {
 	"bt",
 	bt_eisa_methods,
-	DRIVER_TYPE_CAM,
 	sizeof(struct bt_softc),
 };
 
diff --git a/sys/dev/buslogic/bt_isa.c b/sys/dev/buslogic/bt_isa.c
index f2150a7..c9d52c3 100644
--- a/sys/dev/buslogic/bt_isa.c
+++ b/sys/dev/buslogic/bt_isa.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: bt_isa.c,v 1.9 1999/04/18 19:08:28 peter Exp $
+ *	$Id: bt_isa.c,v 1.10 1999/04/24 06:48:27 peter Exp $
  */
 
 #include <sys/param.h>
@@ -330,7 +330,6 @@ static device_method_t bt_isa_methods[] = {
 static driver_t bt_isa_driver = {
 	"bt",
 	bt_isa_methods,
-	DRIVER_TYPE_CAM,
 	sizeof(struct bt_softc),
 };
 
diff --git a/sys/dev/buslogic/bt_pci.c b/sys/dev/buslogic/bt_pci.c
index c5dd842..b126364 100644
--- a/sys/dev/buslogic/bt_pci.c
+++ b/sys/dev/buslogic/bt_pci.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: bt_pci.c,v 1.5 1999/04/18 15:50:35 peter Exp $
+ *	$Id: bt_pci.c,v 1.6 1999/04/23 23:30:22 gibbs Exp $
  */
 
 #include "pci.h"
@@ -224,7 +224,6 @@ static device_method_t bt_pci_methods[] = {
 static driver_t bt_pci_driver = {
 	"bt",
 	bt_pci_methods,
-	DRIVER_TYPE_CAM,
 	sizeof(struct bt_softc),
 };