summaryrefslogtreecommitdiffstats
path: root/sys/pccard/pcic.c
diff options
context:
space:
mode:
authorbde <bde@FreeBSD.org>1997-07-21 16:50:46 +0000
committerbde <bde@FreeBSD.org>1997-07-21 16:50:46 +0000
commit59566a149147f1a4ffe5cf45722ae207f752280f (patch)
tree01fde007d2211d5aff7a5fda996a6a779714de6d /sys/pccard/pcic.c
parent086a90ce38f529dbd8af1870fb4d4aa197e8d88a (diff)
downloadFreeBSD-src-59566a149147f1a4ffe5cf45722ae207f752280f.zip
FreeBSD-src-59566a149147f1a4ffe5cf45722ae207f752280f.tar.gz
Use soft_imask instead of SWI_MASK in the LKM version. SWI_MASK shouldn't
have been visible in LKMs, since it had the wrong value for the APIC_IO case. Removed unused #includes.
Diffstat (limited to 'sys/pccard/pcic.c')
-rw-r--r--sys/pccard/pcic.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/sys/pccard/pcic.c b/sys/pccard/pcic.c
index 4e1f5a8..65eadcd 100644
--- a/sys/pccard/pcic.c
+++ b/sys/pccard/pcic.c
@@ -42,15 +42,11 @@
#include <vm/pmap.h>
#include <machine/clock.h>
-#include <machine/ipl.h>
#include <i386/isa/icu.h>
#include <i386/isa/isa_device.h>
#include <pccard/i82365.h>
-#ifdef PC98
-#include <pccard/pcic98reg.h>
-#endif
#include <pccard/card.h>
#include <pccard/driver.h>
@@ -64,7 +60,6 @@
#if NPCI > 0
#include <pci/pcivar.h>
-#include <pci/pcireg.h>
static char *
pcic_pci_probe(pcici_t tag, pcidi_t type)
@@ -791,7 +786,7 @@ pcic_probe(void)
* then attempt to get one.
*/
if (pcic_irq == 0) {
- pcic_imask = SWI_MASK;
+ pcic_imask = soft_imask;
pcic_irq = pccard_alloc_intr(free_irqs,
pcicintr, 0, NULL, &pcic_imask);
if (pcic_irq < 0)
OpenPOWER on IntegriCloud