summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormsmith <msmith@FreeBSD.org>2000-09-30 20:13:57 +0000
committermsmith <msmith@FreeBSD.org>2000-09-30 20:13:57 +0000
commit017c58324c4e1ec2f7ba068f6d99153cb68860eb (patch)
treeb10b5b6d88584f223972c0338f546db92be52627
parent43b494595ef50e9426434fd028f71567c7fc2e36 (diff)
downloadFreeBSD-src-017c58324c4e1ec2f7ba068f6d99153cb68860eb.zip
FreeBSD-src-017c58324c4e1ec2f7ba068f6d99153cb68860eb.tar.gz
Update include paths for new header locations.
Submitted by: iwasaki
-rw-r--r--usr.sbin/acpi/Makefile.inc2
-rw-r--r--usr.sbin/acpi/acpiconf/acpiconf.c5
-rw-r--r--usr.sbin/acpi/acpidump/acpi.c3
-rw-r--r--usr.sbin/acpi/acpidump/acpi_user.c3
-rw-r--r--usr.sbin/acpi/acpidump/acpidump.c3
-rw-r--r--usr.sbin/acpi/acpidump/aml_dump.c3
-rw-r--r--usr.sbin/acpi/acpidump/asl_dump.c3
-rw-r--r--usr.sbin/acpi/amldb/debug.c1
8 files changed, 15 insertions, 8 deletions
diff --git a/usr.sbin/acpi/Makefile.inc b/usr.sbin/acpi/Makefile.inc
index eaa7df3..206bade 100644
--- a/usr.sbin/acpi/Makefile.inc
+++ b/usr.sbin/acpi/Makefile.inc
@@ -1,5 +1,5 @@
# $Id: Makefile.inc,v 1.1 2000/07/14 18:16:22 iwasaki Exp $
# $FreeBSD$
-CFLAGS+= -Wall -static
+CFLAGS+= -Wall -static -I${.CURDIR}/../../../sys
BINDIR?= /usr/sbin
diff --git a/usr.sbin/acpi/acpiconf/acpiconf.c b/usr.sbin/acpi/acpiconf/acpiconf.c
index 2dde3c2..d4fac94 100644
--- a/usr.sbin/acpi/acpiconf/acpiconf.c
+++ b/usr.sbin/acpi/acpiconf/acpiconf.c
@@ -28,13 +28,16 @@
*/
#include <sys/param.h>
-#include <sys/acpi.h>
#include <err.h>
#include <fcntl.h>
#include <stdio.h>
+#include <sys/ioctl.h>
#include <unistd.h>
+#include <dev/acpi/acpiio.h>
+#include <dev/acpi/acpireg.h>
+
#define ACPIDEV "/dev/acpi"
static int
diff --git a/usr.sbin/acpi/acpidump/acpi.c b/usr.sbin/acpi/acpidump/acpi.c
index d52a0d9..ee798ac 100644
--- a/usr.sbin/acpi/acpidump/acpi.c
+++ b/usr.sbin/acpi/acpidump/acpi.c
@@ -30,7 +30,6 @@
#include <sys/param.h>
#include <sys/stat.h>
-#include <sys/acpi.h>
#include <assert.h>
#include <err.h>
@@ -38,6 +37,8 @@
#include <stdio.h>
#include <unistd.h>
+#include <dev/acpi/acpireg.h>
+
#include "acpidump.h"
static void
diff --git a/usr.sbin/acpi/acpidump/acpi_user.c b/usr.sbin/acpi/acpidump/acpi_user.c
index 56d21e7..6aaef8a 100644
--- a/usr.sbin/acpi/acpidump/acpi_user.c
+++ b/usr.sbin/acpi/acpidump/acpi_user.c
@@ -32,7 +32,6 @@
#include <sys/mman.h>
#include <sys/queue.h>
#include <sys/stat.h>
-#include <sys/acpi.h>
#include <err.h>
#include <fcntl.h>
@@ -40,6 +39,8 @@
#include <string.h>
#include <unistd.h>
+#include <dev/acpi/acpireg.h>
+
#include "acpidump.h"
static int acpi_mem_fd = -1;
diff --git a/usr.sbin/acpi/acpidump/acpidump.c b/usr.sbin/acpi/acpidump/acpidump.c
index a61f9d6..19fd01b 100644
--- a/usr.sbin/acpi/acpidump/acpidump.c
+++ b/usr.sbin/acpi/acpidump/acpidump.c
@@ -28,13 +28,14 @@
*/
#include <sys/param.h>
-#include <sys/acpi.h>
#include <assert.h>
#include <err.h>
#include <stdio.h>
#include <unistd.h>
+#include <dev/acpi/acpireg.h>
+
#include "acpidump.h"
static void
diff --git a/usr.sbin/acpi/acpidump/aml_dump.c b/usr.sbin/acpi/acpidump/aml_dump.c
index 6176df3..57241f9 100644
--- a/usr.sbin/acpi/acpidump/aml_dump.c
+++ b/usr.sbin/acpi/acpidump/aml_dump.c
@@ -29,12 +29,13 @@
#include <sys/param.h>
#include <sys/stat.h>
-#include <sys/acpi.h>
#include <fcntl.h>
#include <stdio.h>
#include <unistd.h>
+#include <dev/acpi/acpireg.h>
+
#include "acpidump.h"
char *aml_dumpfile = NULL;
diff --git a/usr.sbin/acpi/acpidump/asl_dump.c b/usr.sbin/acpi/acpidump/asl_dump.c
index 4cbd362..1ff421e 100644
--- a/usr.sbin/acpi/acpidump/asl_dump.c
+++ b/usr.sbin/acpi/acpidump/asl_dump.c
@@ -29,12 +29,13 @@
*/
#include <sys/param.h>
-#include <sys/acpi.h>
#include <assert.h>
#include <err.h>
#include <stdio.h>
+#include <dev/acpi/acpireg.h>
+
#include "acpidump.h"
static u_int32_t
diff --git a/usr.sbin/acpi/amldb/debug.c b/usr.sbin/acpi/amldb/debug.c
index 794c3d6..080cb53 100644
--- a/usr.sbin/acpi/amldb/debug.c
+++ b/usr.sbin/acpi/amldb/debug.c
@@ -29,7 +29,6 @@
*/
#include <sys/param.h>
-#include <sys/acpi.h>
#include <dev/acpi/aml/aml_name.h>
#include <dev/acpi/aml/aml_amlmem.h>
OpenPOWER on IntegriCloud