From 57bb0b6ca49cdd01098ab04fda81a87197188825 Mon Sep 17 00:00:00 2001
From: iwasaki <iwasaki@FreeBSD.org>
Date: Tue, 9 Jul 2002 17:54:02 +0000
Subject: Resolve conflicts arising from the ACPI CA 20020611 import.

---
 usr.sbin/acpi/acpiconf/acpiconf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'usr.sbin')

diff --git a/usr.sbin/acpi/acpiconf/acpiconf.c b/usr.sbin/acpi/acpiconf/acpiconf.c
index a5cec5f..3d83803 100644
--- a/usr.sbin/acpi/acpiconf/acpiconf.c
+++ b/usr.sbin/acpi/acpiconf/acpiconf.c
@@ -38,7 +38,7 @@
 
 #include <dev/acpica/acpiio.h>
 
-#include <contrib/dev/acpica/acgcc.h>
+#include <contrib/dev/acpica/acfreebsd.h>
 #include <contrib/dev/acpica/actypes.h>
 
 #define ACPIDEV	"/dev/acpi"
-- 
cgit v1.1