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/contrib/dev/acpica/acutils.h | |
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/contrib/dev/acpica/acutils.h')
-rw-r--r-- | sys/contrib/dev/acpica/acutils.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/contrib/dev/acpica/acutils.h b/sys/contrib/dev/acpica/acutils.h index 3dc539a..7b94784 100644 --- a/sys/contrib/dev/acpica/acutils.h +++ b/sys/contrib/dev/acpica/acutils.h @@ -191,6 +191,9 @@ NATIVE_CHAR * AcpiUtGetMutexName ( UINT32 MutexId); +#endif + + NATIVE_CHAR * AcpiUtGetTypeName ( ACPI_OBJECT_TYPE Type); @@ -199,9 +202,6 @@ NATIVE_CHAR * AcpiUtGetObjectTypeName ( ACPI_OPERAND_OBJECT *ObjDesc); -#endif - - NATIVE_CHAR * AcpiUtGetRegionName ( UINT8 SpaceId); |