summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/amd64/conf/RAMDISK3
-rw-r--r--sys/arch/amd64/conf/RAMDISK_CD3
-rw-r--r--sys/arch/i386/conf/RAMDISK3
-rw-r--r--sys/arch/i386/conf/RAMDISKB3
-rw-r--r--sys/arch/i386/conf/RAMDISKC3
-rw-r--r--sys/arch/i386/conf/RAMDISK_CD3
6 files changed, 12 insertions, 6 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?
diff --git a/sys/arch/i386/conf/RAMDISK b/sys/arch/i386/conf/RAMDISK
index ff978188cce..ce549274223 100644
--- a/sys/arch/i386/conf/RAMDISK
+++ b/sys/arch/i386/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.154 2007/10/07 18:41:07 mbalmer Exp $
+# $OpenBSD: RAMDISK,v 1.155 2007/11/06 22:14:54 deraadt Exp $
machine i386 # architecture, used by config; REQUIRED
@@ -38,6 +38,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/i386/conf/RAMDISKB b/sys/arch/i386/conf/RAMDISKB
index e53a752db92..90ba22a0d10 100644
--- a/sys/arch/i386/conf/RAMDISKB
+++ b/sys/arch/i386/conf/RAMDISKB
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISKB,v 1.98 2007/10/07 18:41:07 mbalmer Exp $
+# $OpenBSD: RAMDISKB,v 1.99 2007/11/06 22:14:54 deraadt Exp $
machine i386 # architecture, used by config; REQUIRED
@@ -38,6 +38,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/i386/conf/RAMDISKC b/sys/arch/i386/conf/RAMDISKC
index b7b7932e717..31017f757a7 100644
--- a/sys/arch/i386/conf/RAMDISKC
+++ b/sys/arch/i386/conf/RAMDISKC
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISKC,v 1.78 2007/10/07 18:41:07 mbalmer Exp $
+# $OpenBSD: RAMDISKC,v 1.79 2007/11/06 22:14:54 deraadt Exp $
machine i386 # architecture, used by config; REQUIRED
@@ -38,6 +38,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/i386/conf/RAMDISK_CD b/sys/arch/i386/conf/RAMDISK_CD
index 5c7df0d6a2f..2cbd7e63e74 100644
--- a/sys/arch/i386/conf/RAMDISK_CD
+++ b/sys/arch/i386/conf/RAMDISK_CD
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK_CD,v 1.143 2007/10/07 18:41:07 mbalmer Exp $
+# $OpenBSD: RAMDISK_CD,v 1.144 2007/11/06 22:14:54 deraadt Exp $
machine i386 # architecture, used by config; REQUIRED
@@ -40,6 +40,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?