summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbrian <brian@FreeBSD.org>2001-05-19 09:28:59 +0000
committerbrian <brian@FreeBSD.org>2001-05-19 09:28:59 +0000
commitef009d9e4262085b11f9573dd36cf4fc1568d7b6 (patch)
treec893b120a43c708523bfe37280f4c6971fbc6d74
parent09f7f114792c87255b99e286731d347f6849f6d6 (diff)
downloadFreeBSD-src-ef009d9e4262085b11f9573dd36cf4fc1568d7b6.zip
FreeBSD-src-ef009d9e4262085b11f9573dd36cf4fc1568d7b6.tar.gz
digiio.h has moved to /usr/include/sys
-rw-r--r--sys/dev/digi/digi.c10
-rw-r--r--sys/dev/digi/digi_isa.c2
-rw-r--r--sys/dev/digi/digi_pci.c2
-rw-r--r--sys/modules/digi/digi/Makefile2
-rw-r--r--usr.sbin/digictl/digictl.c3
5 files changed, 9 insertions, 10 deletions
diff --git a/sys/dev/digi/digi.c b/sys/dev/digi/digi.c
index cb3e060..ec99fb6 100644
--- a/sys/dev/digi/digi.c
+++ b/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
diff --git a/sys/dev/digi/digi_isa.c b/sys/dev/digi/digi_isa.c
index 3d0bc87..050f8df 100644
--- a/sys/dev/digi/digi_isa.c
+++ b/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 */
diff --git a/sys/dev/digi/digi_pci.c b/sys/dev/digi/digi_pci.c
index 859f435..8d63e30 100644
--- a/sys/dev/digi/digi_pci.c
+++ b/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>
diff --git a/sys/modules/digi/digi/Makefile b/sys/modules/digi/digi/Makefile
index 2c64024..5a6dfc2 100644
--- a/sys/modules/digi/digi/Makefile
+++ b/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>
diff --git a/usr.sbin/digictl/digictl.c b/usr.sbin/digictl/digictl.c
index ffc8648..49d48df 100644
--- a/usr.sbin/digictl/digictl.c
+++ b/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)
{
OpenPOWER on IntegriCloud