diff options
| -rw-r--r-- | sys/arch/i386/conf/GENERIC | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC index 31589397a1a..cced82f7798 100644 --- a/sys/arch/i386/conf/GENERIC +++ b/sys/arch/i386/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.44 1997/09/11 21:35:31 gene Exp $ +# $OpenBSD: GENERIC,v 1.45 1997/09/13 21:43:44 mickey Exp $ # $NetBSD: GENERIC,v 1.48 1996/05/20 18:17:23 mrg Exp $ # # GENERIC -- everything that's currently supported @@ -42,10 +42,10 @@ pci0 at mainbus0 bus ? ppb* at pci? dev ? function ? # PCI-PCI bridges pci* at ppb? bus ? -pcicmaster0 at isa? port 0x3E0 size 2 +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 +pcicmaster1 at isa? port 0x3E2 size 2 pcic2 at pcicmaster1 irq 11 iomem 0xd6000 iosiz 4096 pcic3 at pcicmaster1 irq 12 iomem 0xd7000 iosiz 4096 @@ -69,7 +69,7 @@ com* at ast? slave ? #com* at boca? slave ? #rtfps0 at isa? port 0x1230 irq 10 # RT 4-port serial cards #com* at rtfps? slave ? -com3 at pcmcia? port 0x2e8 size 8 irq 3 slot ? # PCMCIA modem cards +com3 at pcmcia? port 0x2e8 size 8 irq 3 slot ? # PCMCIA modem cards # option for using CD1400 handshaking for incoming data # requires a special cable that exchanges the RTS and DTR lines @@ -143,7 +143,7 @@ eg0 at isa? port 0x310 irq 5 # 3C505/Etherlink+ ethernet cards el0 at isa? port 0x300 irq 9 # 3C501 ethernet cards ep0 at isa? port ? irq ? # 3C509 ethernet cards ep* at isa? port ? irq ? # 3C509 ethernet cards -ex0 at isa? port ? irq ? # Intel EtherExpress PRO/10 +ex0 at isa? port ? irq ? # Intel EtherExpress PRO/10 ie0 at isa? port 0x360 iomem 0xd0000 irq 7 # StarLAN and 3C507 ie1 at isa? port 0x300 irq 10 # EtherExpress le0 at isa? port 0x360 irq 15 drq 6 # IsoLan, NE2100, and DEPCA @@ -156,8 +156,8 @@ fxp* at pci? dev ? function ? # EtherExpress 10/100B ethernet cards ed* at pci? dev ? function ? # NE2000-compat ethernet cards ep0 at pci? dev ? function ? # 3C590 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 +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 fpa* at pci? dev ? function ? # DEC DEFPA FDDI cards pss0 at isa? port 0x220 irq 7 drq 6 # Personal Sound System @@ -172,4 +172,4 @@ gus0 at isa? port 0x220 irq 7 drq 1 flags 6 # Gravis UltraSound (flags is record # Joystick driver. Probe is a little strange; add only if you have one. #joy0 at isa? port 0x201 -pseudo-device pctr 1 +pseudo-device pctr 1 |