- Reenable building of the ACPI module on i386.

- Remove 'device acpi' from i386 GENERIC and revert back to using ACPI as a module by default. Approved by: re (scottl / blanket)
svn path=/head/; revision=123136
2003-12-03 21:13:06 +00:00 · 2003-12-03 21:13:06 +00:00 · 8eca42d505 · 2020-12-20 02:59:44 +00:00
commit 8eca42d505
parent 4a211a60e5
2 changed files with 1 additions and 1 deletions
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@ -69,7 +69,6 @@ options 	WITNESS_SKIPSPIN	#Don't run witness on spinlocks for speed
 options 	SMP			# Symmetric MultiProcessor Kernel
 device		apic			# I/O APIC

-device		acpi
 device		isa
 device		eisa
 device		pci
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@ -234,6 +234,7 @@ SUBDIR+=3dfx \

 .if ${MACHINE} == "i386"
 SUBDIR+=aac \
+	acpi \
 	asr \
 	bios \
 	cardbus \