summaryrefslogtreecommitdiff
path: root/sys/arch/i386
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch/i386')
-rw-r--r--sys/arch/i386/conf/GENERIC3
-rw-r--r--sys/arch/i386/conf/RAMDISK3
2 files changed, 4 insertions, 2 deletions
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index 0ca300f8060..4f64471f7d6 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.47 1997/09/21 04:27:32 mickey Exp $
+# $OpenBSD: GENERIC,v 1.48 1997/09/24 17:17:41 deraadt Exp $
# $NetBSD: GENERIC,v 1.48 1996/05/20 18:17:23 mrg Exp $
#
# GENERIC -- everything that's currently supported
@@ -37,6 +37,7 @@ mainbus0 at root
bios0 at mainbus0
apm0 at mainbus0
+option APM_NOIDLE
isa0 at mainbus0
eisa0 at mainbus0
pci0 at mainbus0 bus ?
diff --git a/sys/arch/i386/conf/RAMDISK b/sys/arch/i386/conf/RAMDISK
index 05f780f3d5a..f2e1002a27e 100644
--- a/sys/arch/i386/conf/RAMDISK
+++ b/sys/arch/i386/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.13 1997/09/21 04:27:33 mickey Exp $
+# $OpenBSD: RAMDISK,v 1.14 1997/09/24 17:17:42 deraadt Exp $
# from: OpenBSD: INST,v 1.19 1996/11/05 03:49:13 tholo Exp
#
# Install kernels no longer support X.
@@ -52,6 +52,7 @@ mainbus0 at root
bios0 at mainbus0
apm0 at mainbus0
+option APM_NOIDLE
isa0 at mainbus0
eisa0 at mainbus0
pci0 at mainbus0