Move the type definition of ointhand2_t from i386/include/types.h to

i386/isa/isa_device.h.  This is a more appropriate location and
helps restrict <machine/types.h> to only types that exist on all
platforms.

sys/i386/include/types.h

@@ -66,7 +66,4 @@ typedef	register_t	critical_t;
 /* Interrupt mask (spl, xxx_imask, etc) */
 typedef	__uint32_t	intrmask_t;
 
-/* Interrupt handler function type. */
-typedef	void		ointhand2_t(int _device_id);
-
 #endif /* !_MACHINE_TYPES_H_ */

sys/i386/isa/isa_device.h

@@ -48,6 +48,10 @@
  */
 
 #ifdef COMPAT_OLDISA
+
+/* Interrupt handler function type. */
+typedef	void	ointhand2_t(int _device_id);
+
 /*
  * Per device structure.
  */