summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Shalayeff <mickey@cvs.openbsd.org>1998-06-17 11:49:24 +0000
committerMichael Shalayeff <mickey@cvs.openbsd.org>1998-06-17 11:49:24 +0000
commit463d6780e5bcb7c4d6932fbb9b55321bac5187d3 (patch)
tree49cf7a9c8c1c2b8c9e7d1ba9ace1e4dcb7c63ce7
parent51c04334e2e12471a7a8582be987da794fbad0a0 (diff)
there is no such thing as APM_NOIDLE any more
-rw-r--r--sys/arch/i386/conf/BABY3
-rw-r--r--sys/arch/i386/conf/GENERIC4
-rw-r--r--sys/arch/i386/conf/LAP3
-rw-r--r--sys/arch/i386/conf/PETRA4
-rw-r--r--sys/arch/i386/conf/RAMDISK4
5 files changed, 8 insertions, 10 deletions
diff --git a/sys/arch/i386/conf/BABY b/sys/arch/i386/conf/BABY
index 975dfdfa682..a87594679d9 100644
--- a/sys/arch/i386/conf/BABY
+++ b/sys/arch/i386/conf/BABY
@@ -1,4 +1,4 @@
-# $OpenBSD: BABY,v 1.32 1998/01/22 19:05:57 deraadt Exp $
+# $OpenBSD: BABY,v 1.33 1998/06/17 11:49:19 mickey Exp $
machine i386 # architecture, used by config; REQUIRED
@@ -85,7 +85,6 @@ mainbus0 at root
bios0 at mainbus0
apm0 at bios0
-option APM_NOIDLE
isa0 at mainbus0
eisa0 at mainbus0
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index f4597438dc5..d7fa808b77b 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.66 1998/06/02 18:46:33 deraadt Exp $
+# $OpenBSD: GENERIC,v 1.67 1998/06/17 11:49:20 mickey Exp $
# $NetBSD: GENERIC,v 1.48 1996/05/20 18:17:23 mrg Exp $
#
# GENERIC -- everything that's currently supported
@@ -39,7 +39,7 @@ mainbus0 at root
bios0 at mainbus0
apm0 at bios0
-option APM_NOIDLE
+
isa0 at mainbus0
eisa0 at mainbus0
pci* at mainbus0 bus ?
diff --git a/sys/arch/i386/conf/LAP b/sys/arch/i386/conf/LAP
index 876519f30d0..5f0c76461fa 100644
--- a/sys/arch/i386/conf/LAP
+++ b/sys/arch/i386/conf/LAP
@@ -1,4 +1,4 @@
-# $OpenBSD: LAP,v 1.23 1997/10/20 01:40:11 todd Exp $
+# $OpenBSD: LAP,v 1.24 1998/06/17 11:49:21 mickey Exp $
# $NetBSD: TDR,v 1.64 1996/03/25 05:45:49 perry Exp $
#
# TDR -- Theo Deraadt's 486
@@ -162,7 +162,6 @@ wd* at wdc? drive ?
#sb0 at isa? port 0x220 irq 7 drq 1 # SoundBlaster
#spkr0 at pckbd? port 0x61
-option APM_NOIDLE
#option PCIVERBOSE
#option PCMCIA_DEBUG
#option PCMCIA_ISA_DEBUG
diff --git a/sys/arch/i386/conf/PETRA b/sys/arch/i386/conf/PETRA
index b595c470837..9c6202ab3b0 100644
--- a/sys/arch/i386/conf/PETRA
+++ b/sys/arch/i386/conf/PETRA
@@ -1,4 +1,4 @@
-# $OpenBSD: PETRA,v 1.9 1998/02/22 22:04:22 niklas Exp $
+# $OpenBSD: PETRA,v 1.10 1998/06/17 11:49:22 mickey Exp $
#
# PETRA -- everything that's currently supported with certain
# changes for Applitron's fileserver petra, a 128 MB
@@ -48,7 +48,7 @@ mainbus0 at root
bios0 at mainbus0
apm0 at bios0
-option APM_NOIDLE
+
isa0 at mainbus0
eisa0 at mainbus0
pci* at mainbus0 bus ?
diff --git a/sys/arch/i386/conf/RAMDISK b/sys/arch/i386/conf/RAMDISK
index e9565d43f30..9144bfe125b 100644
--- a/sys/arch/i386/conf/RAMDISK
+++ b/sys/arch/i386/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.29 1998/03/28 10:00:44 deraadt Exp $
+# $OpenBSD: RAMDISK,v 1.30 1998/06/17 11:49:23 mickey Exp $
# from: OpenBSD: INST,v 1.19 1996/11/05 03:49:13 tholo Exp
#
# Install kernels no longer support X.
@@ -53,8 +53,8 @@ mainbus0 at root
bios0 at mainbus0
apm0 at bios0
-option APM_NOIDLE
option APMDEBUG
+
isa0 at mainbus0
eisa0 at mainbus0
pci* at mainbus0