diff options
author | phk <phk@FreeBSD.org> | 1999-05-09 09:56:52 +0000 |
---|---|---|
committer | phk <phk@FreeBSD.org> | 1999-05-09 09:56:52 +0000 |
commit | 5311a954e6af4df580ff652ed312d69001af109c (patch) | |
tree | 3f5c897abb40b77bae8e1abaf282ae825635ccbd | |
parent | bea63b9cdb6799073ba1479c2854e1f110857e96 (diff) | |
download | FreeBSD-src-5311a954e6af4df580ff652ed312d69001af109c.zip FreeBSD-src-5311a954e6af4df580ff652ed312d69001af109c.tar.gz |
fix some DRIVER_TYPE / INTR_TYPE confusions.
-rw-r--r-- | sys/i386/isa/isa_compat.h | 4 | ||||
-rw-r--r-- | sys/pci/intpm.c | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/sys/i386/isa/isa_compat.h b/sys/i386/isa/isa_compat.h index 116ed10..98e3235 100644 --- a/sys/i386/isa/isa_compat.h +++ b/sys/i386/isa/isa_compat.h @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: isa_compat.h,v 1.5 1999/05/08 14:36:47 phk Exp $ + * $Id: isa_compat.h,v 1.6 1999/05/08 21:59:26 dfr Exp $ */ #include "vt.h" @@ -261,7 +261,7 @@ static struct old_isa_driver old_drivers[] = { { INTR_TYPE_BIO, &wtdriver }, #endif #if NFLA > 0 - { DRIVER_TYPE_MISC, &fladriver }, + { INTR_TYPE_BIO, &fladriver }, #endif /* NET */ diff --git a/sys/pci/intpm.c b/sys/pci/intpm.c index 40705f8..97fc71c 100644 --- a/sys/pci/intpm.c +++ b/sys/pci/intpm.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: intpm.c,v 1.8 1999/05/07 18:03:26 peter Exp $ + * $Id: intpm.c,v 1.9 1999/05/08 21:59:39 dfr Exp $ */ #include "pci.h" @@ -149,7 +149,6 @@ static device_method_t intpm_pci_methods[] = { static driver_t intpm_pci_driver = { "intpm", intpm_pci_methods, - DRIVER_TYPE_MISC, sizeof(struct intpm_pci_softc) }; @@ -722,7 +721,7 @@ intpm_attach(device_t dev) device_printf(dev,"could not allocate irq"); return ENOMEM; } - error=bus_setup_intr(dev,res,(driver_intr_t *) intpm_intr,sciic,&ih); + error=bus_setup_intr(dev,res,INTR_TYPE_MISC, (driver_intr_t *) intpm_intr,sciic,&ih); if(error){ device_printf(dev,"Failed to map intr\n"); return error; |