Move the declaration of the interrupt type from the driver structure

to the BUS_SETUP_INTR call.

3 files changed, 5 insertions, 7 deletions

diff --git a/sys/dev/aic7xxx/ahc_eisa.c b/sys/dev/aic7xxx/ahc_eisa.c
index fe02ca6..e0c0c51 100644
--- a/sys/dev/aic7xxx/ahc_eisa.c
+++ b/sys/dev/aic7xxx/ahc_eisa.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ahc_eisa.c,v 1.6 1999/04/18 15:50:33 peter Exp $
+ *	$Id: ahc_eisa.c,v 1.7 1999/04/23 23:29:00 gibbs Exp $
  */
 
 #include "eisa.h"
@@ -465,7 +465,6 @@ static device_method_t ahc_eisa_methods[] = {
 static driver_t ahc_eisa_driver = {
 	"ahc",
 	ahc_eisa_methods,
-	DRIVER_TYPE_CAM,
 	1,			/* unused */
 };
 
diff --git a/sys/dev/aic7xxx/ahc_pci.c b/sys/dev/aic7xxx/ahc_pci.c
index 818e491..7f8fd69 100644
--- a/sys/dev/aic7xxx/ahc_pci.c
+++ b/sys/dev/aic7xxx/ahc_pci.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ahc_pci.c,v 1.8 1999/03/23 07:26:41 gibbs Exp $
+ *	$Id: ahc_pci.c,v 1.9 1999/04/23 23:30:21 gibbs Exp $
  */
 
 #include <pci.h>
@@ -162,7 +162,6 @@ static device_method_t ahc_pci_methods[] = {
 static driver_t ahc_pci_driver = {
 	"ahc",
 	ahc_pci_methods,
-	DRIVER_TYPE_CAM,
 	sizeof(struct ahc_softc)
 };
 
diff --git a/sys/dev/aic7xxx/aic7xxx.c b/sys/dev/aic7xxx/aic7xxx.c
index 215e0a4..cc68263 100644
--- a/sys/dev/aic7xxx/aic7xxx.c
+++ b/sys/dev/aic7xxx/aic7xxx.c
@@ -36,7 +36,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: aic7xxx.c,v 1.24 1999/04/26 22:03:44 ken Exp $
+ *      $Id: aic7xxx.c,v 1.25 1999/05/06 20:16:17 ken Exp $
  */
 /*
  * A few notes on features of the driver.
@@ -1377,8 +1377,8 @@ ahc_attach(struct ahc_softc *ahc)
 
 	s = splcam();
 	/* Hook up our interrupt handler */
-	if ((error = bus_setup_intr(ahc->device, ahc->irq, ahc_intr,
-				    ahc, &ahc->ih)) != 0) {
+	if ((error = bus_setup_intr(ahc->device, ahc->irq, INTR_TYPE_CAM,
+				    ahc_intr, ahc, &ahc->ih)) != 0) {
 		device_printf(ahc->device, "bus_setup_intr() failed: %d\n",
 			      error);
 		goto fail;