summaryrefslogtreecommitdiff
path: root/sys/arch/i386/conf/HELIOS_PCMCIA
diff options
context:
space:
mode:
authorNiklas Hallqvist <niklas@cvs.openbsd.org>1996-04-18 18:56:28 +0000
committerNiklas Hallqvist <niklas@cvs.openbsd.org>1996-04-18 18:56:28 +0000
commit4104c84a022b28c96373b5f6844b39e0d092672b (patch)
tree5ed62775c6100fd3c11824a6358acab8d26c9ff4 /sys/arch/i386/conf/HELIOS_PCMCIA
parent2486fc6168bd5163df06fb048ad4fd9e70f751dc (diff)
Merge of NetBSD 960317
Diffstat (limited to 'sys/arch/i386/conf/HELIOS_PCMCIA')
-rw-r--r--sys/arch/i386/conf/HELIOS_PCMCIA13
1 files changed, 8 insertions, 5 deletions
diff --git a/sys/arch/i386/conf/HELIOS_PCMCIA b/sys/arch/i386/conf/HELIOS_PCMCIA
index bb708369d99..b412cdfb0ad 100644
--- a/sys/arch/i386/conf/HELIOS_PCMCIA
+++ b/sys/arch/i386/conf/HELIOS_PCMCIA
@@ -1,3 +1,4 @@
+# $OpenBSD: HELIOS_PCMCIA,v 1.3 1996/04/18 18:55:35 niklas Exp $
#
# HELIOS_PCMCIA -- Eric Hvozda's notebook
#
@@ -49,17 +50,19 @@ options INET # IP + ICMP + TCP + UDP
config bsd root on wd0a swap on wd0b and vnd0b dumps on wd0b
-isa0 at root
-pci0 at root
+mainbus0 at root
+
+isa0 at mainbus0
+pci0 at mainbus0
npx0 at isa? port 0xf0 irq 13 # math coprocessor
pc0 at isa? port 0x60 irq 1 # generic PC console device
pcic0 at isa? port 0x3E0 flags 0
-pcmciabus0 at isa? iomem 0xd4000 iosiz 4096
-com2 at pcmciabus? port 0x3e8 irq 12
-ed2 at pcmciabus? port 0x300 iomem 0xcc000 irq 10
+pcmcia0 at pcic? iomem 0xd4000 iosiz 4096
+com2 at pcmcia? port 0x3e8 irq 12
+ed2 at pcmcia? port 0x300 iomem 0xcc000 irq 10
com0 at isa? port 0x3f8 irq 4 # standard PC serial ports
com1 at isa? port 0x2f8 irq 3