digiio.h has moved to /usr/include/sys

sys/dev/digi/digi.c

@@ -51,11 +51,11 @@
 #include <sys/bus.h>
 #include <machine/resource.h>
 
-#include <dev/digi/digireg.h>
-#include <dev/digi/digiio.h>
-#include <dev/digi/digi.h>
-#include <dev/digi/digi_mod.h>
-#include <dev/digi/digi_pci.h>
+#include <sys/digiio.h>
+#include <digi/digireg.h>
+#include <digi/digi.h>
+#include <digi/digi_mod.h>
+#include <digi/digi_pci.h>
 
 #define	CDEV_MAJOR	162
 

sys/dev/digi/digi_isa.c

@@ -47,8 +47,8 @@
 #include <vm/vm.h>
 #include <vm/pmap.h>
 
+#include <sys/digiio.h>
 #include <digi/digireg.h>
-#include <digi/digiio.h>
 #include <digi/digi.h>
 
 /* Valid i/o addresses are any of these with either 0 or 4 added */

sys/dev/digi/digi_pci.c

@@ -42,8 +42,8 @@
 #include <vm/pmap.h>
 #include <pci/pcivar.h>
 
+#include <sys/digiio.h>
 #include <digi/digireg.h>
-#include <digi/digiio.h>
 #include <digi/digi.h>
 #include <digi/digi_pci.h>
 

sys/modules/digi/digi/Makefile

@@ -3,7 +3,7 @@
 .PATH:	${.CURDIR}/../../../dev/digi
 KMOD=	digi
 SRCS=	digi.c digi_pci.c digi_isa.c
-SRCS+=	digi.h digi_pci.h digireg.h digiio.h digi_mod.h
+SRCS+=	digi.h digi_pci.h digireg.h digi_mod.h
 SRCS+=	bus_if.h pci_if.h device_if.h
 
 .include <bsd.kmod.mk>

usr.sbin/digictl/digictl.c

@@ -32,11 +32,10 @@
 #include <stdlib.h>
 #include <string.h>
 #include <sysexits.h>
+#include <sys/digiio.h>
 #include <sys/ioctl.h>
 #include <unistd.h>
 
-#include "dev/digi/digiio.h"
-
 static int
 usage(const char *prog)
 {