summaryrefslogtreecommitdiff
path: root/sys/arch/amd64/conf
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch/amd64/conf')
-rw-r--r--sys/arch/amd64/conf/RAMDISK3
-rw-r--r--sys/arch/amd64/conf/RAMDISK_CD3
2 files changed, 4 insertions, 2 deletions
diff --git a/sys/arch/amd64/conf/RAMDISK b/sys/arch/amd64/conf/RAMDISK
index b0640c8e09f..c4cd8e0c288 100644
--- a/sys/arch/amd64/conf/RAMDISK
+++ b/sys/arch/amd64/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.40 2007/08/20 00:02:13 deraadt Exp $
+# $OpenBSD: RAMDISK,v 1.41 2007/11/06 22:14:54 deraadt Exp $
machine amd64 # architecture, used by config; REQUIRED
@@ -33,6 +33,7 @@ config bsd root on rd0a swap on rd0b and wd0b and sd0b
mainbus0 at root
+option ACPI_ENABLE
acpi0 at mainbus? disable
#acpitimer* at acpi?
#acpihpet* at acpi?
diff --git a/sys/arch/amd64/conf/RAMDISK_CD b/sys/arch/amd64/conf/RAMDISK_CD
index f3c7e759c6a..14519ac7dd6 100644
--- a/sys/arch/amd64/conf/RAMDISK_CD
+++ b/sys/arch/amd64/conf/RAMDISK_CD
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK_CD,v 1.76 2007/07/27 13:39:00 deraadt Exp $
+# $OpenBSD: RAMDISK_CD,v 1.77 2007/11/06 22:14:54 deraadt Exp $
machine amd64 # architecture, used by config; REQUIRED
@@ -34,6 +34,7 @@ config bsd root on rd0a swap on rd0b and wd0b and sd0b
mainbus0 at root
+option ACPI_ENABLE
acpi0 at mainbus? disable
#acpitimer* at acpi?
#acpihpet* at acpi?