summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authorkato <kato@FreeBSD.org>1997-08-06 09:42:57 +0000
committerkato <kato@FreeBSD.org>1997-08-06 09:42:57 +0000
commit2ec57417ef4dd116debc176fff79825270d8dd36 (patch)
tree4f4a387d5f1d4b09aa5b66c658a62c92c8b1f611 /sys
parent3dc01ff10ff34e3ca1b3705e189bc7dfe8fa3d8f (diff)
downloadFreeBSD-src-2ec57417ef4dd116debc176fff79825270d8dd36.zip
FreeBSD-src-2ec57417ef4dd116debc176fff79825270d8dd36.tar.gz
Synchronize with sys/i386/isa/sio.c revision 1.174.
Diffstat (limited to 'sys')
-rw-r--r--sys/pc98/cbus/sio.c5
-rw-r--r--sys/pc98/pc98/sio.c5
2 files changed, 6 insertions, 4 deletions
diff --git a/sys/pc98/cbus/sio.c b/sys/pc98/cbus/sio.c
index 9f9a1f7..9fef976 100644
--- a/sys/pc98/cbus/sio.c
+++ b/sys/pc98/cbus/sio.c
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* from: @(#)com.c 7.5 (Berkeley) 5/16/91
- * $Id: sio.c,v 1.30 1997/07/20 11:59:48 kato Exp $
+ * $Id: sio.c,v 1.31 1997/07/21 13:11:12 kato Exp $
*/
#include "opt_comconsole.h"
@@ -160,13 +160,14 @@
#include <pccard/slot.h>
#endif
-#if defined(APIC_IO)
+#ifdef APIC_IO
/*
* INTs are masked in the (global) IO APIC,
* but the IRR register is in each LOCAL APIC,
* so we HAVE to unmask the INT to be able to "see INT pending"
* BUT how do we clear them???
*/
+#include <i386/isa/intr_machdep.h>
#define isa_irq_pending icu_irq_pending
#endif /* APIC_IO */
diff --git a/sys/pc98/pc98/sio.c b/sys/pc98/pc98/sio.c
index 9f9a1f7..9fef976 100644
--- a/sys/pc98/pc98/sio.c
+++ b/sys/pc98/pc98/sio.c
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* from: @(#)com.c 7.5 (Berkeley) 5/16/91
- * $Id: sio.c,v 1.30 1997/07/20 11:59:48 kato Exp $
+ * $Id: sio.c,v 1.31 1997/07/21 13:11:12 kato Exp $
*/
#include "opt_comconsole.h"
@@ -160,13 +160,14 @@
#include <pccard/slot.h>
#endif
-#if defined(APIC_IO)
+#ifdef APIC_IO
/*
* INTs are masked in the (global) IO APIC,
* but the IRR register is in each LOCAL APIC,
* so we HAVE to unmask the INT to be able to "see INT pending"
* BUT how do we clear them???
*/
+#include <i386/isa/intr_machdep.h>
#define isa_irq_pending icu_irq_pending
#endif /* APIC_IO */
OpenPOWER on IntegriCloud