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/modules/acpi | |
| 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/modules/acpi')
| -rw-r--r-- | sys/modules/acpi/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/modules/acpi/Makefile b/sys/modules/acpi/Makefile index e6f5c90..4a8ac4d 100644 --- a/sys/modules/acpi/Makefile +++ b/sys/modules/acpi/Makefile @@ -33,7 +33,7 @@ SRCS+= acpi_powerres.c acpi_resource.c acpi_thermal.c acpi_timer.c SRCS+= acpica_support.c SRCS+= OsdDebug.c SRCS+= OsdHardware.c OsdInterrupt.c OsdMemory.c OsdSchedule.c -SRCS+= OsdStream.c OsdSynch.c OsdEnvironment.c +SRCS+= OsdStream.c OsdSynch.c OsdTable.c OsdEnvironment.c SRCS+= opt_acpi.h opt_ddb.h SRCS+= device_if.h bus_if.h pci_if.h pcib_if.h isa_if.h .if ACPI_NO_SEMAPHORES |
