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 /usr.sbin | |
| 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 'usr.sbin')
| -rw-r--r-- | usr.sbin/acpi/acpiconf/acpiconf.c | 2 |
1 files changed, 1 insertions, 1 deletions
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" |
