- Remove the inthand2_t type and use the equivalent driver_intr_t type from

  newbus for referencing device interrupt handlers.
- Move the 'struct intrec' type which describes interrupt sources into
  sys/interrupt.h instead of making it just be a x86 structure.
- Don't create 'ithd' and 'intrec' typedefs, instead, just use 'struct ithd'
  and 'struct intrec'
- Move the code to translate new-bus interrupt flags into an interrupt thread
  priority out of the x86 nexus code and into a MI ithread_priority()
  function in sys/kern/kern_intr.c.
- Remove now-uneeded x86-specific headers from sys/dev/ata/ata-all.c and
  sys/pci/pci_compat.c.

1 files changed, 1 insertions, 8 deletions

diff --git a/sys/pci/pci_compat.c b/sys/pci/pci_compat.c
index 2e7eba5..447fc58 100644
--- a/sys/pci/pci_compat.c
+++ b/sys/pci/pci_compat.c
@@ -38,12 +38,12 @@
 
 #include <vm/vm.h>
 #include <vm/pmap.h>
-#include <sys/interrupt.h>
 
 #include <sys/bus.h>
 #include <machine/bus.h>
 #include <sys/rman.h>
 #include <machine/resource.h>
+#include <sys/interrupt.h>
 
 #include <sys/pciio.h>
 #include <pci/pcireg.h>
@@ -53,13 +53,6 @@
 #include <machine/smp.h>
 #endif
 
-#ifdef __i386__
-#include <sys/proc.h>
-#include <i386/isa/icu.h>
-#include <i386/isa/intr_machdep.h>
-#endif
-
-
 /* ------------------------------------------------------------------------- */
 
 u_long