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

---
 sys/boot/i386/libi386/biosacpi.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'sys/boot')

diff --git a/sys/boot/i386/libi386/biosacpi.c b/sys/boot/i386/libi386/biosacpi.c
index d4918dfca6567..f10b006a6167a 100644
--- a/sys/boot/i386/libi386/biosacpi.c
+++ b/sys/boot/i386/libi386/biosacpi.c
@@ -30,8 +30,7 @@
 #include <machine/stdarg.h>
 #include <bootstrap.h>
 
-#define COMPILER_DEPENDENT_INT64	long long
-#define COMPILER_DEPENDENT_UINT64	unsigned long long
+#include "acfreebsd.h"
 #include "actypes.h"
 #include "actbl.h"
 
-- 
cgit v1.3