diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2003-06-01 13:04:04 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2003-06-01 13:04:04 +0000 |
| commit | 345cf55c40f7beff8ab2f9db25c315c38d34bfd6 (patch) | |
| tree | 9fd99bdaff5d11dea65b2f3ae8e2017941e77d1a /sys/arch/i386/conf/GENERIC | |
| parent | c91d78c618d6674f20f837d08d774e3f4f8b5f95 (diff) | |
Revert ep0 removal, deraadt@ objects.
Diffstat (limited to 'sys/arch/i386/conf/GENERIC')
| -rw-r--r-- | sys/arch/i386/conf/GENERIC | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC index c3e2df2cace..4e3b1275856 100644 --- a/sys/arch/i386/conf/GENERIC +++ b/sys/arch/i386/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.341 2003/05/31 23:58:43 miod Exp $ +# $OpenBSD: GENERIC,v 1.342 2003/06/01 13:04:03 miod Exp $ # $NetBSD: GENERIC,v 1.48 1996/05/20 18:17:23 mrg Exp $ # # GENERIC -- everything that's currently supported @@ -332,8 +332,9 @@ ne2 at isa? port 0x280 irq 9 # NE[12]000 ethernet ne* at isapnp? # NE[12]000 PnP ethernet eg0 at isa? disable port 0x310 irq 5 # 3C505/Etherlink+ ethernet el0 at isa? disable port 0x300 irq 9 # 3C501 ethernet -ep* at isa? port ? irq ? # 3C509 ethernet +ep0 at isa? port ? irq ? # 3C509 ethernet ep* at isapnp? # 3C509 PnP ethernet +ep* at isa? port ? irq ? # 3C509 ethernet ef* at isapnp? # 3C515 PnP ethernet ie0 at isa? port 0x360 iomem 0xd0000 irq 7 # StarLAN and 3C507 #ie1 at isa? port 0x300 irq 10 # EtherExpress @@ -344,6 +345,7 @@ ex0 at isa? port 0x320 irq 5 # Intel EtherExpress PRO/10 #tr0 at isa? port 0xa20 iomem 0xd8000 irq ? # IBM TROPIC based Token-Ring #tr1 at isa? port 0xa24 iomem 0xd0000 irq ? # IBM TROPIC based Token-Ring #tr* at isa? port ? irq ? # 3COM TROPIC based Token-Ring +ep0 at eisa? slot ? ep* at eisa? slot ? # 3C579 ethernet fea* at eisa? slot ? # DEC DEFEA FDDI lmc* at pci? dev ? function ? # Lan Media Corp SSI/T3/HSSI @@ -353,6 +355,7 @@ de* at pci? dev ? function ? # DC21X4X-based ethernet fxp* at pci? dev ? function ? # EtherExpress 10/100B ethernet fxp* at cardbus? dev ? function ? # Intel PRO/100 ethernet ne* at pci? dev ? function ? # NE2000-compat ethernet +ep0 at pci? dev ? function ? # 3C59x ethernet ep* at pci? dev ? function ? # 3C59x ethernet ne* at pcmcia? function ? # PCMCIA based NE2000 ethernet ep* at pcmcia? function ? # PCMCIA based 3C5xx ethernet |