- 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, 4 insertions, 1 deletions

diff --git a/sys/i4b/layer1/i4b_avm_fritz_pnp.c b/sys/i4b/layer1/i4b_avm_fritz_pnp.c
index a411c8c..54db491 100644
--- a/sys/i4b/layer1/i4b_avm_fritz_pnp.c
+++ b/sys/i4b/layer1/i4b_avm_fritz_pnp.c
@@ -53,6 +53,9 @@
 #include <sys/param.h>
 #if defined(__FreeBSD__) && __FreeBSD__ >= 3
 #include <sys/ioccom.h>
+#if __FreeBSD__ >= 5
+#include <sys/bus.h>
+#endif
 #else
 #include <sys/ioctl.h>
 #endif
@@ -436,7 +439,7 @@ isic_probe_avm_pnp(struct isa_device *dev, unsigned int iobase2)
 	}
 	sc->sc_irq = dev->id_irq;
 
-        dev->id_intr = (inthand2_t *) avm_pnp_intr;
+        dev->id_intr = (driver_intr_t *) avm_pnp_intr;
 
 	/* check if memory addr specified */