From 8eca42d5054ff4159be7791bd7b984e1a5e94699 Mon Sep 17 00:00:00 2001
From: John Baldwin <jhb@FreeBSD.org>
Date: Wed, 3 Dec 2003 21:13:06 +0000
Subject: [PATCH] - 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)
---
 sys/i386/conf/GENERIC | 1 -
 sys/modules/Makefile  | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index 6c9a2b30681..2a62bb834b7 100644
--- 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
diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index d0b7cbc9fcc..7f9b0c00b87 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -234,6 +234,7 @@ SUBDIR+=3dfx \
 
 .if ${MACHINE} == "i386"
 SUBDIR+=aac \
+	acpi \
 	asr \
 	bios \
 	cardbus \