diff options
| author | iwasaki <iwasaki@FreeBSD.org> | 2002-07-09 17:54:02 +0000 |
|---|---|---|
| committer | iwasaki <iwasaki@FreeBSD.org> | 2002-07-09 17:54:02 +0000 |
| commit | 57bb0b6ca49cdd01098ab04fda81a87197188825 (patch) | |
| tree | dfd1e75d9d7a42530736716ee1fc7c35f267f753 /sys/boot/i386 | |
| parent | 900789083d83b1bdef94797be7ef6652e6900546 (diff) | |
| download | FreeBSD-src-57bb0b6ca49cdd01098ab04fda81a87197188825.zip FreeBSD-src-57bb0b6ca49cdd01098ab04fda81a87197188825.tar.gz | |
Resolve conflicts arising from the ACPI CA 20020611 import.
Diffstat (limited to 'sys/boot/i386')
| -rw-r--r-- | sys/boot/i386/libi386/biosacpi.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sys/boot/i386/libi386/biosacpi.c b/sys/boot/i386/libi386/biosacpi.c index d4918df..f10b006 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" |
