summaryrefslogtreecommitdiff
path: root/sys/arch/i386/conf/GENERIC
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch/i386/conf/GENERIC')
-rw-r--r--sys/arch/i386/conf/GENERIC7
1 files changed, 4 insertions, 3 deletions
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index 259448b66fc..719639b6df8 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.11 1996/05/09 19:07:11 hvozda Exp $
+# $OpenBSD: GENERIC,v 1.12 1996/05/09 20:50:03 hvozda Exp $
# $NetBSD: GENERIC,v 1.44 1996/04/25 20:14:13 scottr Exp $
#
# GENERIC -- everything that's currently supported
@@ -93,6 +93,7 @@ pci0 at mainbus0 bus ?
ppb* at pci? dev ? function ? # PCI-PCI bridges
pci* at ppb? bus ?
+pcicmaster0 at isa? port 0x3E0 size 2
pcic0 at pcicmaster0 irq 11 iomem 0xd4000 iosiz 4096
pcic1 at pcicmaster0 irq 12 iomem 0xd5000 iosiz 4096
pcicmaster1 at isa? port 0x3E2 size 2
@@ -177,7 +178,6 @@ wt0 at isa? port 0x300 irq 5 drq 1 # Archive and Wangtek QIC tape drives
ed0 at isa? port 0x280 iomem 0xd0000 irq 9 # WD/SMC, 3C503, and NE[12]000
ed1 at isa? port 0x250 iomem 0xd8000 irq 9 # ethernet cards
ed2 at isa? port 0x300 iomem 0xcc000 irq 10
-ed* at pcmcia? port 0x300 size 0x20 irq 10 slot ? # PCMCIA based ed cards
#eg0 at isa? ... # 3C505 ethernet cards
el0 at isa? port 0x300 irq 9 # 3C501 ethernet cards
ep0 at isa? port ? irq ? # 3C509 ethernet cards
@@ -185,10 +185,11 @@ ie0 at isa? port 0x360 iomem 0xd0000 irq 7 # StarLAN and 3C507
ie1 at isa? port 0x300 irq 10 # EtherExpress
#le0 at isa? port 0x320 irq 10 drq 7 # IsoLan, NE2100, and DEPCA
ep* at eisa? slot ? # 3C579 ethernet cards
-ep* at pcmcia? port 0x300 size 0x10 irq 10 slot ? # PCMCIA based ep cards
le* at pci? dev ? function ? # PCnet-PCI based ethernet cards
de* at pci? dev ? function ? # DC21X4X-based ethernet cards
ep* at pci? dev ? function ? # 3C590 ethernet cards
+ed* at pcmcia? port 0x300 size 0x20 irq 10 slot ? # PCMCIA based ed cards
+ep* at pcmcia? port 0x300 size 0x10 irq 10 slot ? # PCMCIA based ep cards
pss0 at isa? port 0x220 irq 7 drq 6 # Personal Sound System
sp0 at pss0 port 0x530 irq 10 drq 0 # sound port driver