summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorMarco Peereboom <marco@cvs.openbsd.org>2005-12-16 23:21:18 +0000
committerMarco Peereboom <marco@cvs.openbsd.org>2005-12-16 23:21:18 +0000
commitba2b4a367995d0ecf79394670b49cdceed8bcce6 (patch)
tree05e2cd3ca3e457936f35497bee79f1af5310139b /sys
parent12492eeeb84d55f216cd0668ca7cde795787f7be (diff)
Sync with i386 acpi stuff. Remains disabled of course.
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/amd64/conf/GENERIC10
1 files changed, 6 insertions, 4 deletions
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index 4e4f8d4ba0d..3be5bf79347 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.93 2005/12/16 03:56:04 deraadt Exp $
+# $OpenBSD: GENERIC,v 1.94 2005/12/16 23:21:17 marco Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -42,15 +42,17 @@ isa0 at mainbus0
isa0 at pcib?
pci* at mainbus0
+#option ACPIVERBOSE
+#option ACPI_ENABLE
+
#acpi0 at mainbus?
#acpitimer* at acpi?
#hpet* at acpi?
+#acpiac* at acpi?
+#acpibat* at acpi?
ipmi0 at mainbus? # IPMI
-#option ACPIVERBOSE
-#option ACPI_ENABLE
-
option PCIVERBOSE
option USBVERBOSE