diff options
author | iwasaki <iwasaki@FreeBSD.org> | 2002-08-29 01:52:27 +0000 |
---|---|---|
committer | iwasaki <iwasaki@FreeBSD.org> | 2002-08-29 01:52:27 +0000 |
commit | 4559ce39515218336d303d08e98b6b270e30ae74 (patch) | |
tree | 95fceb56f685c0f3e06b5b639c2d61ec8a4d8ef1 /sys/dev/acpica/Osd | |
parent | 3bcec26bd51aa2f2e4522f20e03477d32e3cc132 (diff) | |
download | FreeBSD-src-4559ce39515218336d303d08e98b6b270e30ae74.zip FreeBSD-src-4559ce39515218336d303d08e98b6b270e30ae74.tar.gz |
Resolve conflicts arising from the ACPI CA 20020815 import.
Diffstat (limited to 'sys/dev/acpica/Osd')
-rw-r--r-- | sys/dev/acpica/Osd/OsdDebug.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/dev/acpica/Osd/OsdDebug.c b/sys/dev/acpica/Osd/OsdDebug.c index cfcf5b6..1651d25 100644 --- a/sys/dev/acpica/Osd/OsdDebug.c +++ b/sys/dev/acpica/Osd/OsdDebug.c @@ -100,7 +100,7 @@ AcpiOsSignal ( return(AE_OK); } -#ifdef ENABLE_DEBUGGER +#ifdef ACPI_DEBUGGER void acpi_EnterDebugger(void) { |