summaryrefslogtreecommitdiff
path: root/sys/arch/i386/conf
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch/i386/conf')
-rw-r--r--sys/arch/i386/conf/DISKLESS3
-rw-r--r--sys/arch/i386/conf/ELBERETH3
-rw-r--r--sys/arch/i386/conf/GANDALF3
-rw-r--r--sys/arch/i386/conf/HERMES3
-rw-r--r--sys/arch/i386/conf/LAP3
-rw-r--r--sys/arch/i386/conf/LUCIFIER3
-rw-r--r--sys/arch/i386/conf/NETTAN3
-rw-r--r--sys/arch/i386/conf/OPRAH4
-rw-r--r--sys/arch/i386/conf/PETRA3
-rw-r--r--sys/arch/i386/conf/SARUMAN4
-rw-r--r--sys/arch/i386/conf/WALDORF3
11 files changed, 11 insertions, 24 deletions
diff --git a/sys/arch/i386/conf/DISKLESS b/sys/arch/i386/conf/DISKLESS
index 142902d40ae..114a1e9445c 100644
--- a/sys/arch/i386/conf/DISKLESS
+++ b/sys/arch/i386/conf/DISKLESS
@@ -1,4 +1,4 @@
-# $OpenBSD: DISKLESS,v 1.22 1998/07/11 15:31:17 todd Exp $
+# $OpenBSD: DISKLESS,v 1.23 1999/01/02 00:32:56 niklas Exp $
# $NetBSD: DISKLESS,v 1.26 1996/05/20 18:17:16 mrg Exp $
#
# DISKLESS -- Generic machine setup for diskless boot.
@@ -158,7 +158,6 @@ ie1 at isa? port 0x300 irq 10 # EtherExpress
#le0 at isa? port 0x320 irq 10 drq 7 # IsoLan, NE2100, and DEPCA
sb0 at isa? port 0x220 irq 7 drq 1 # SoundBlaster
-#spkr0 at pckbd? port 0x61
pseudo-device loop 1 # network loopback
pseudo-device bpfilter 8 # packet filter
diff --git a/sys/arch/i386/conf/ELBERETH b/sys/arch/i386/conf/ELBERETH
index 4503c73b3b4..b4272358f96 100644
--- a/sys/arch/i386/conf/ELBERETH
+++ b/sys/arch/i386/conf/ELBERETH
@@ -1,5 +1,5 @@
#
-# $OpenBSD: ELBERETH,v 1.17 1998/09/25 16:10:41 kstailey Exp $
+# $OpenBSD: ELBERETH,v 1.18 1999/01/02 00:32:56 niklas Exp $
#
#
# ELBERETH -- 166MHz Pentium PCI
@@ -111,7 +111,6 @@ sb* at isapnp?
audio* at sb?
pms0 at pckbd? irq 12 # PS/2 auxiliary port mouse
-spkr0 at pckbd? port 0x61 # built-in speaker
de* at pci? dev ? function ? # DC21X4X-based ethernet cards
diff --git a/sys/arch/i386/conf/GANDALF b/sys/arch/i386/conf/GANDALF
index fc765552866..4980a15e50a 100644
--- a/sys/arch/i386/conf/GANDALF
+++ b/sys/arch/i386/conf/GANDALF
@@ -1,7 +1,7 @@
#
# GANDALF -- Dual Tyan P5/133 PCI/EISA bus
#
-# $OpenBSD: GANDALF,v 1.28 1998/08/10 18:51:47 provos Exp $
+# $OpenBSD: GANDALF,v 1.29 1999/01/02 00:32:55 niklas Exp $
#
machine i386 # architecture, used by config; REQUIRED
@@ -131,7 +131,6 @@ acd* at atapibus? drive?
ep* at eisa? slot ? # 3C579 ethernet card
gus0 at isa? port 0x220 irq 12 drq 5 drq2 6 # Gravis UltraSound (drq2 is record drq)
-spkr0 at pckbd? # PC speaker
pseudo-device loop 1 # network loopback
pseudo-device bpfilter 8 # packet filter
diff --git a/sys/arch/i386/conf/HERMES b/sys/arch/i386/conf/HERMES
index ff56d2857ad..db361bc91ad 100644
--- a/sys/arch/i386/conf/HERMES
+++ b/sys/arch/i386/conf/HERMES
@@ -3,7 +3,7 @@
#
# This system was a 468 but now has an Intel Pentium Overdrive Processor[tm]
#
-# $OpenBSD: HERMES,v 1.15 1998/10/09 21:57:21 kstailey Exp $
+# $OpenBSD: HERMES,v 1.16 1999/01/02 00:32:55 niklas Exp $
machine i386 # architecture, used by config; REQUIRED
@@ -110,7 +110,6 @@ fd* at fdc? drive ?
ne0 at isa? port 0x300 irq 10 iomem 0xd000 # Linksys Ether16 LAN
-spkr0 at pckbd? port 0x61 # built-in speaker
sb0 at isa? port 0x220 irq 5 drq 3 # SoundBlaster
audio* at sb?
diff --git a/sys/arch/i386/conf/LAP b/sys/arch/i386/conf/LAP
index 5d10e164091..15bdd0905f5 100644
--- a/sys/arch/i386/conf/LAP
+++ b/sys/arch/i386/conf/LAP
@@ -1,4 +1,4 @@
-# $OpenBSD: LAP,v 1.27 1998/09/11 11:35:35 fgsch Exp $
+# $OpenBSD: LAP,v 1.28 1999/01/02 00:32:55 niklas Exp $
# $NetBSD: TDR,v 1.64 1996/03/25 05:45:49 perry Exp $
#
# TDR -- Theo Deraadt's 486
@@ -160,7 +160,6 @@ wd* at wdc? drive ?
#le0 at isa? port 0x320 irq 10 drq 7 # IsoLan, NE2100, and DEPCA
#sb0 at isa? port 0x220 irq 7 drq 1 # SoundBlaster
-#spkr0 at pckbd? port 0x61
#option PCIVERBOSE
#option PCMCIA_DEBUG
diff --git a/sys/arch/i386/conf/LUCIFIER b/sys/arch/i386/conf/LUCIFIER
index 3c21635c554..2708a43c031 100644
--- a/sys/arch/i386/conf/LUCIFIER
+++ b/sys/arch/i386/conf/LUCIFIER
@@ -1,4 +1,4 @@
-# $OpenBSD: LUCIFIER,v 1.17 1998/09/27 17:54:22 mickey Exp $
+# $OpenBSD: LUCIFIER,v 1.18 1999/01/02 00:32:55 niklas Exp $
#
source /sys
@@ -214,7 +214,6 @@ sb0 at isa? port 0x220 irq 5 drq 1 # SoundBlaster
#wss0 at isa? port 0x530 irq 10 drq 0 # Windows Sound System
#pas0 at isa? port 0x220 irq 7 drq 1 # ProAudio Spectrum
#gus0 at isa? port 0x220 irq 7 drq 1 flags 6 # Gravis UltraSound (flags is record drq)
-spkr0 at pckbd? port 0x61
audio* at sb?
diff --git a/sys/arch/i386/conf/NETTAN b/sys/arch/i386/conf/NETTAN
index 6e38a4ef329..5f7ad8d79c6 100644
--- a/sys/arch/i386/conf/NETTAN
+++ b/sys/arch/i386/conf/NETTAN
@@ -1,4 +1,4 @@
-# $OpenBSD: NETTAN,v 1.29 1998/09/11 11:35:35 fgsch Exp $
+# $OpenBSD: NETTAN,v 1.30 1999/01/02 00:32:55 niklas Exp $
#
# NETTAN -- Applitron Datasystem AB
#
@@ -253,7 +253,6 @@ sb0 at isa? port 0x220 irq 7 drq 1 # SoundBlaster
wss0 at isa? port 0x530 irq 10 drq 0 # Windows Sound System
pas0 at isa? port 0x220 irq 7 drq 1 # ProAudio Spectrum
gus0 at isa? port 0x220 irq 7 drq 1 drq2 6 # Gravis UltraSound (drq2 is record drq)
-#spkr0 at pckbd? port 0x61
# Joystick driver. Probe is a little strange; add only if you have one.
#joy0 at isa? port 0x201
diff --git a/sys/arch/i386/conf/OPRAH b/sys/arch/i386/conf/OPRAH
index 12c8f6c7681..95dc60b9a3a 100644
--- a/sys/arch/i386/conf/OPRAH
+++ b/sys/arch/i386/conf/OPRAH
@@ -1,4 +1,4 @@
-# $OpenBSD: OPRAH,v 1.21 1998/07/11 15:31:25 todd Exp $
+# $OpenBSD: OPRAH,v 1.22 1999/01/02 00:32:54 niklas Exp $
#
# OPRAH -- Niklas Hallqvist's test machine
#
@@ -121,8 +121,6 @@ acd* at atapibus? drive ?
ed0 at isa? port 0x320 iomem 0xd0000 irq 5
-#spkr0 at isa? ...
-
pseudo-device loop 1 # network loopback
pseudo-device bpfilter 8 # packet filter
#pseudo-device sl 2 # CSLIP
diff --git a/sys/arch/i386/conf/PETRA b/sys/arch/i386/conf/PETRA
index 83baa2cbf35..d8e4bbf7de5 100644
--- a/sys/arch/i386/conf/PETRA
+++ b/sys/arch/i386/conf/PETRA
@@ -1,4 +1,4 @@
-# $OpenBSD: PETRA,v 1.14 1998/09/11 11:26:23 fgsch Exp $
+# $OpenBSD: PETRA,v 1.15 1999/01/02 00:32:54 niklas Exp $
#
# PETRA -- everything that's currently supported with certain
# changes for Applitron's fileserver petra, a 128 MB
@@ -188,7 +188,6 @@ sb* at isapnp?
wss0 at isa? port 0x530 irq 10 drq 0 # Windows Sound System
pas0 at isa? port 0x220 irq 7 drq 1 # ProAudio Spectrum
gus0 at isa? port 0x220 irq 7 drq 1 drq2 6 # Gravis UltraSound (drq2 is record drq)
-#spkr0 at pckbd? port 0x61
# Joystick driver. Probe is a little strange; add only if you have one.
#joy0 at isa? port 0x201
diff --git a/sys/arch/i386/conf/SARUMAN b/sys/arch/i386/conf/SARUMAN
index 9f6ec3adb9b..6f6e82a52c3 100644
--- a/sys/arch/i386/conf/SARUMAN
+++ b/sys/arch/i386/conf/SARUMAN
@@ -1,7 +1,7 @@
#
# SARUMAN -- i486DX/50 EISA bus
#
-# $OpenBSD: SARUMAN,v 1.7 1998/07/11 15:31:27 todd Exp $
+# $OpenBSD: SARUMAN,v 1.8 1999/01/02 00:32:54 niklas Exp $
#
machine i386 # architecture, used by config; REQUIRED
@@ -106,8 +106,6 @@ wd* at wdc? drive ?
ep0 at isa? port ? irq ? # 3C509 ethernet cards
-spkr0 at pckbd? # PC speaker
-
pseudo-device loop 1 # network loopback
pseudo-device bpfilter 8 # packet filter
pseudo-device enc 4 # encryption device
diff --git a/sys/arch/i386/conf/WALDORF b/sys/arch/i386/conf/WALDORF
index 66072b927f4..47560b34029 100644
--- a/sys/arch/i386/conf/WALDORF
+++ b/sys/arch/i386/conf/WALDORF
@@ -1,4 +1,4 @@
-# $OpenBSD: WALDORF,v 1.17 1998/07/11 15:31:29 todd Exp $
+# $OpenBSD: WALDORF,v 1.18 1999/01/02 00:32:53 niklas Exp $
#
# WALDORF -- a 486 kernel config Applitron use for some gateway
# machines (waldorf and neuro).
@@ -177,7 +177,6 @@ ed2 at isa? port 0x300 iomem 0xcc000 irq 10
#wss0 at isa? port 0x530 irq 10 drq 0 # Windows Sound System
#pas0 at isa? port 0x220 irq 7 drq 1 # ProAudio Spectrum
#gus0 at isa? port 0x220 irq 7 drq 1 flags 6 # Gravis Ultra Sound (flags is record drq for full-duplex)
-#spkr0 at isa? ...
pseudo-device loop 1 # network loopback
pseudo-device bpfilter 8 # packet filter